From f10da58ec367cd802ae697d34c51f447b32a34a2 Mon Sep 17 00:00:00 2001 From: Tobias Rapp Date: Wed, 31 Mar 2021 11:41:49 +0200 Subject: 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 --- fftools/ffprobe.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'fftools/ffprobe.c') 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; -- cgit v1.2.3