[FFmpeg-cvslog] tests/fate-run: Use DEC_OPTS for additional input, too

Andreas Rheinhardt git at videolan.org
Fri Oct 8 13:23:58 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Oct  8 09:39:10 2021 +0200| [6d72126e9ba857c68f0a363729ad67097355c090] | committer: Andreas Rheinhardt

tests/fate-run: Use DEC_OPTS for additional input, too

Should fix failures in the cover-art-flac-remux test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d72126e9ba857c68f0a363729ad67097355c090
---

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

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 87b5539296..fbfc0a925d 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -232,12 +232,13 @@ transcode(){
     enc_opt=$4
     final_decode=$5
     ffprobe_opts=$7
-    additional_inputs=$8
+    additional_input=$8
+    test -z "$additional_input" || additional_input="$DEC_OPTS $additional_input"
     encfile="${outdir}/${test}.${enc_fmt}"
     test "$6" = -keep || cleanfiles="$cleanfiles $encfile"
     tsrcfile=$(target_path $srcfile)
     tencfile=$(target_path $encfile)
-    ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_inputs \
+    ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_input \
            $ENC_OPTS $enc_opt $FLAGS -f $enc_fmt -y $tencfile || return
     do_md5sum $encfile
     echo $(wc -c $encfile)



More information about the ffmpeg-cvslog mailing list