| Message ID | 1617185604-18044-1-git-send-email-t.rapp@noa-archive.com |
|---|---|
| State | Accepted |
| Commit | f10da58ec367cd802ae697d34c51f447b32a34a2 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] fftools/ffprobe: Remove check on show_frames and show_packets in XML writer | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
On 31.03.2021 12:13, Tobias Rapp wrote: > 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 | 7 ------- > 1 file changed, 7 deletions(-) > > [..] BTW, this can be tested using a command-line like: ffprobe -show_streams -show_packets -show_format -show_frames \ tests/data/ffprobe-test.nut -noprivate -of xml=q=1:x=1 | \ xmllint --noout --schema doc/ffprobe.xsd - If there are no objections I'd like to apply both patches at the end of this week. Regards, Tobias
On 13.04.2021 08:54, Tobias Rapp wrote: > On 31.03.2021 12:13, Tobias Rapp wrote: >> 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 | 7 ------- >> 1 file changed, 7 deletions(-) >> >> [..] > > BTW, this can be tested using a command-line like: > > ffprobe -show_streams -show_packets -show_format -show_frames \ > tests/data/ffprobe-test.nut -noprivate -of xml=q=1:x=1 | \ > xmllint --noout --schema doc/ffprobe.xsd - > > If there are no objections I'd like to apply both patches at the end of > this week. Applied both patches. Regards, Tobias
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;
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 | 7 ------- 1 file changed, 7 deletions(-)