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.r...@noa-archive.com>
---
fftools/ffprobe.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 38462e1..1bfc144 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;
--
2.7.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
