X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=tests%2Fregression-funcs.sh;h=8219e54a9cce78a0061239b532790a0f4c67927b;hb=4cc8e153715ed9757974e4976c5766d2e731bee0;hp=3306f399416d6824153f235c4f13bcd85ebdba2a;hpb=493a86e25b9e51b45231c510cabe481ae369fb37;p=ffmpeg

diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 3306f399416..8219e54a9cc 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -10,6 +10,7 @@ raw_src_dir=$3
 target_exec=$4
 target_path=$5
 threads=${6:-1}
+cpuflags=${8:-all}
 
 datadir="./tests/data"
 target_datadir="${target_path}/${datadir}"
@@ -43,7 +44,7 @@ echov(){
 
 . $(dirname $0)/md5.sh
 
-AVCONV_OPTS="-nostats -y"
+AVCONV_OPTS="-nostats -y -cpuflags $cpuflags"
 COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact"
 DEC_OPTS="$COMMON_OPTS -threads $threads"
 ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
@@ -66,22 +67,7 @@ do_avconv()
     elif [ $f = $pcm_dst ] ; then
         $tiny_psnr $f $pcm_ref 2
     else
-        wc -c $f
-    fi
-}
-
-do_avconv_nomd5()
-{
-    f="$1"
-    shift
-    set -- $* ${target_path}/$f
-    run_avconv $*
-    if [ $f = $raw_dst ] ; then
-        $tiny_psnr $f $raw_ref
-    elif [ $f = $pcm_dst ] ; then
-        $tiny_psnr $f $pcm_ref 2
-    else
-        wc -c $f
+        echo $(wc -c $f)
     fi
 }