summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-10-08 09:39:10 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-10-08 12:06:00 +0200
commit6d72126e9ba857c68f0a363729ad67097355c090 (patch)
tree472b42766cce6835a5ea800dd24c0bedd94960b1 /tests
parent5e1dac380bea627e5b7751e07bdabc0f4ee139c2 (diff)
downloadffmpeg-6d72126e9ba857c68f0a363729ad67097355c090.tar.gz
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@outlook.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/fate-run.sh5
1 files 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)