]> git.sesse.net Git - ffmpeg/commitdiff
fftools/ffprobe: Remove check on show_frames and show_packets in XML writer
authorTobias Rapp <t.rapp@noa-archive.com>
Wed, 31 Mar 2021 09:41:49 +0000 (11:41 +0200)
committerTobias Rapp <t.rapp@noa-archive.com>
Fri, 16 Apr 2021 06:40:09 +0000 (08:40 +0200)
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@noa-archive.com>
fftools/ffprobe.c

index 8c7b238adf606dccce0406e4f3b78253819dfb4f..a2cb7dc9868bbca26d6c7e51f4d2228726bd19f5 100644 (file)
@@ -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;