ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/tests/regression-funcs.sh

 #!/bin/sh
 #
 # common regression functions for ffmpeg
 #
 #
 
 test="${1#regtest-}"
 test_ref=$2
 raw_src_dir=$3
-outfile_prefix=$4
-target_exec=$5
-target_path=$6
+target_exec=$4
+target_path=$5
 
 datadir="./tests/data"
 target_datadir="${target_path}/${datadir}"
 
 this="$test.$test_ref"
 logfile="$datadir/$this.regression"
-outfile="$datadir/${outfile_prefix}-"
+outfile="$datadir/$test_ref/"
 errfile="$datadir/$this.err"
 
 # various files
-ffmpeg="$target_exec ${target_path}/ffmpeg_g"
+ffmpeg="$target_exec ${target_path}/ffmpeg"
 tiny_psnr="tests/tiny_psnr"
 benchfile="$datadir/$this.bench"
 bench="$datadir/$this.bench.tmp"
 bench2="$datadir/$this.bench2.tmp"
 raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 raw_dst="$datadir/$this.out.yuv"
 raw_ref="$datadir/$test_ref.ref.yuv"
 pcm_src="$target_datadir/asynth1.sw"
 pcm_dst="$datadir/$this.out.wav"
 pcm_ref="$datadir/$test_ref.ref.wav"
 crcfile="$datadir/$this.crc"
 target_crcfile="$target_datadir/$this.crc"
 
 mkdir -p "$datadir"
+mkdir -p "$outfile"
 
 [ "${V-0}" -gt 0 ] && echov=echo || echov=:
 [ "${V-0}" -gt 1 ] || exec 2>$errfile
 
-if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then
-    do_md5sum() { md5sum -b $1; }
-elif [ X"$(echo | md5 2> /dev/null)" != X ]; then
-    do_md5sum() { md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; }
-elif [ -x /sbin/md5 ]; then
-    do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; }
-else
-    do_md5sum() { echo No md5sum program found; }
-fi
+. $(dirname $0)/md5.sh
 
 FFMPEG_OPTS="-v 0 -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact"
 
 do_ffmpeg()
 {
     f="$1"
     shift
     set -- $* ${target_path}/$f
     $echov $ffmpeg $FFMPEG_OPTS $*
     $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench
@@ skipping 62 matching lines @@
 do_audio_encoding()
 {
     file=${outfile}$1
     do_ffmpeg $file -ab 128k -ac 2 -f s16le -i $pcm_src $3
 }
 
 do_audio_decoding()
 {
     do_ffmpeg $pcm_dst -i $target_path/$file -sample_fmt s16 -f wav
 }