diff mbox series

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

Message ID AM7PR03MB6660D53963CE6D99981D15F38FB29@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 6d72126e9ba857c68f0a363729ad67097355c090
Headers show
Series [FFmpeg-devel,1/4] avfilter/avfiltergraph: Fix use-after-free when inserting auto-converter | expand

Checks

Context Check Description
andriy/configurex86 warning Failed to apply patch
andriy/configureppc warning Failed to apply patch

Commit Message

Andreas Rheinhardt Oct. 8, 2021, 8:14 a.m. UTC
Should fix failures in the cover-art-flac-remux test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
Sorry for this; will apply this soon.

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

Patch

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)