[FFmpeg-cvslog] fftools/ffprobe: Remove check on show_frames and show_packets in XML writer

[Tobias Rapp]

ffmpeg | branch: master | Tobias Rapp <t.rapp at noa-archive.com> | Wed Mar 31 11:41:49 2021 +0200| [f10da58ec367cd802ae697d34c51f447b32a34a2] | committer: Tobias Rapp

fftools/ffprobe: Remove check on show_frames and show_packets in XML writer

The "packets_and_frames" element has been added to ffprobe.xsd in
0c9f0da0f7656059e9bd41931d250aafddf35ea3 but apparently removing the
check in ffprobe.c has been forgotten.

Signed-off-by: Tobias Rapp <t.rapp at noa-archive.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f10da58ec367cd802ae697d34c51f447b32a34a2
---

 fftools/ffprobe.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 8c7b238adf..a2cb7dc986 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -1660,13 +1660,6 @@ static av_cold int xml_init(WriterContext *wctx)
         CHECK_COMPLIANCE(show_private_data, "private");
         CHECK_COMPLIANCE(show_value_unit,   "unit");
         CHECK_COMPLIANCE(use_value_prefix,  "prefix");
-
-        if (do_show_frames && do_show_packets) {
-            av_log(wctx, AV_LOG_ERROR,
-                   "Interleaved frames and packets are not allowed in XSD. "
-                   "Select only one between the -show_frames and the -show_packets options.\n");
-            return AVERROR(EINVAL);
-        }
     }
 
     return 0;