[FFmpeg-devel] [PATCH v2] fate: Don't use depreceated keepside option

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Mon Dec 30 14:43:27 EET 2019


The tests for concat use this option which is scheduled for removal and
does nothing any more. So remove it; otherwise, these tests would fail
at the next major version bump.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
As James has recently suggested that we might bump major in the coming
months [1], I thought it worthwhile to ressurect my old patchset [2];
and it turned out that the second patch of this patchset does not apply
cleanly any more because of e9bb1410, so here it is rebased on master.

I am also open to comments regarding the other two patches.

[1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-December/254869.html
[2]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-August/248674.html

 tests/fate-run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 83cad8cabe..552b3dd9df 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -471,10 +471,10 @@ concat(){
     awk "{gsub(/%SRCFILE%/, \"$sample\"); print}" $template > $concatfile
 
     if [ "$mode" = "md5" ]; then
-        run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $(target_path $concatfile) | tr -d '\r' > $packetfile
+        run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -safe 0 $extra_args $(target_path $concatfile) | tr -d '\r' > $packetfile
         do_md5sum $packetfile
     else
-        run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $(target_path $concatfile)
+        run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -safe 0 $extra_args $(target_path $concatfile)
     fi
 }
 
-- 
2.20.1



More information about the ffmpeg-devel mailing list