Commit bcea9605 authored by Diego Biurrun's avatar Diego Biurrun

Use a variable for FFmpeg options.

Originally committed as revision 6904 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 899af1a2
...@@ -110,12 +110,14 @@ fi ...@@ -110,12 +110,14 @@ fi
# create the data directory if it does not exists # create the data directory if it does not exists
mkdir -p $datadir mkdir -p $datadir
FFMPEG_OPTS="-y -flags +bitexact -dct fastint -idct simple"
do_ffmpeg() do_ffmpeg()
{ {
f="$1" f="$1"
shift shift
echo $ffmpeg -y -flags +bitexact -dct fastint -idct simple $* echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg -y -flags +bitexact -dct fastint -idct simple -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$ $ffmpeg $FFMPEG_OPTS -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$ rm -f /tmp/ffmpeg$$
do_md5sum $f >> $logfile do_md5sum $f >> $logfile
...@@ -134,8 +136,8 @@ do_ffmpeg_crc() ...@@ -134,8 +136,8 @@ do_ffmpeg_crc()
{ {
f="$1" f="$1"
shift shift
echo $ffmpeg -y -flags +bitexact -dct fastint -idct simple $* -f crc $datadir/ffmpeg.crc echo $ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc
$ffmpeg -y -flags +bitexact -dct fastint -idct simple $* -f crc $datadir/ffmpeg.crc > /tmp/ffmpeg$$ 2>&1 $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 egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:|ffmpeg version| configuration| built)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$ rm -f /tmp/ffmpeg$$
echo "$f `cat $datadir/ffmpeg.crc`" >> $logfile echo "$f `cat $datadir/ffmpeg.crc`" >> $logfile
...@@ -145,8 +147,8 @@ do_ffmpeg_nocheck() ...@@ -145,8 +147,8 @@ do_ffmpeg_nocheck()
{ {
f="$1" f="$1"
shift shift
echo $ffmpeg -y -flags +bitexact -dct fastint -idct simple $* echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg -y -flags +bitexact -dct fastint -idct simple -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$ $ffmpeg $FFMPEG_OPTS -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$ rm -f /tmp/ffmpeg$$
expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment