Merge remote-tracking branch 'qatar/master'

[ffmpeg] / tests / regression-funcs.sh

diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 3162636c096925338faa5707589c7bd0eb61f6bd..c4a0f40684d9a8f59a600100fd0df66bd5e1eb0e 100755 (executable)
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# common regression functions for avconv
+# common regression functions for ffmpeg
 #
 #
 
@@ -20,7 +20,7 @@ this="$test.$test_ref"
 outfile="$datadir/$test_ref/"
 
 # various files
-avconv="$target_exec ${target_path}/ffmpeg"
+ffmpeg="$target_exec ${target_path}/ffmpeg"
 tiny_psnr="tests/tiny_psnr"
 raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 raw_dst="$datadir/$this.out.yuv"
@@ -54,8 +54,8 @@ ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
 
 run_avconv()
 {
-    $echov $avconv $AVCONV_OPTS $*
-    $avconv $AVCONV_OPTS $*
+    $echov $ffmpeg $AVCONV_OPTS $*
+    $ffmpeg $AVCONV_OPTS $*
 }
 
 do_avconv()
@@ -70,7 +70,7 @@ do_avconv()
     elif [ $f = $pcm_dst ] ; then
         $tiny_psnr $f $pcm_ref 2
     else
-        wc -c $f
+        echo $(wc -c $f)
     fi
 }
 
@@ -85,7 +85,7 @@ do_avconv_nomd5()
     elif [ $f = $pcm_dst ] ; then
         $tiny_psnr $f $pcm_ref 2
     else
-        wc -c $f
+        echo $(wc -c $f)
     fi
 }