From bcea96056118be69600d84518ce585e6c646f724 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 5 Nov 2006 18:14:46 +0000 Subject: [PATCH] Use a variable for FFmpeg options. Originally committed as revision 6904 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/regression.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/regression.sh b/tests/regression.sh index 9ded777423..a47c5e1bbf 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -110,12 +110,14 @@ fi # create the data directory if it does not exists mkdir -p $datadir +FFMPEG_OPTS="-y -flags +bitexact -dct fastint -idct simple" + do_ffmpeg() { f="$1" shift - echo $ffmpeg -y -flags +bitexact -dct fastint -idct simple $* - $ffmpeg -y -flags +bitexact -dct fastint -idct simple -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$ + echo $ffmpeg $FFMPEG_OPTS $* + $ffmpeg $FFMPEG_OPTS -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$ egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true rm -f /tmp/ffmpeg$$ do_md5sum $f >> $logfile @@ -134,8 +136,8 @@ do_ffmpeg_crc() { f="$1" shift - echo $ffmpeg -y -flags +bitexact -dct fastint -idct simple $* -f crc $datadir/ffmpeg.crc - $ffmpeg -y -flags +bitexact -dct fastint -idct simple $* -f crc $datadir/ffmpeg.crc > /tmp/ffmpeg$$ 2>&1 + echo $ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc + $ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc > /tmp/ffmpeg$$ 2>&1 egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:|ffmpeg version| configuration| built)" /tmp/ffmpeg$$ || true rm -f /tmp/ffmpeg$$ echo "$f `cat $datadir/ffmpeg.crc`" >> $logfile @@ -145,8 +147,8 @@ do_ffmpeg_nocheck() { f="$1" shift - echo $ffmpeg -y -flags +bitexact -dct fastint -idct simple $* - $ffmpeg -y -flags +bitexact -dct fastint -idct simple -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$ + echo $ffmpeg $FFMPEG_OPTS $* + $ffmpeg $FFMPEG_OPTS -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$ egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true rm -f /tmp/ffmpeg$$ expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp