Merge remote-tracking branch 'qatar/master'

[ffmpeg] / tests / fate-run.sh

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 26ccaea3f576346e1a62ea8f1f78a0aa3301e93c..ccd04a310871853ddb2332a169d5b59342f27bfa 100755 (executable)
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -75,7 +75,13 @@ probefmt(){
 }
 
 ffmpeg(){
-    run ffmpeg -nostats -threads $threads -thread_type $thread_type -cpuflags $cpuflags "$@"
+    dec_opts="-threads $threads -thread_type $thread_type"
+    ffmpeg_args="-nostats -cpuflags $cpuflags"
+    for arg in $@; do
+        [ ${arg} = -i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
+        ffmpeg_args="${ffmpeg_args} ${arg}"
+    done
+    run ffmpeg ${ffmpeg_args}
 }
 
 framecrc(){
@@ -108,7 +114,7 @@ enc_dec_pcm(){
     cleanfiles=$encfile
     encfile=$(target_path ${encfile})
     ffmpeg -i $src_file "$@" -f $out_fmt -y ${encfile} || return
-    ffmpeg -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
+    ffmpeg -flags +bitexact -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
 }
 
 FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact"