diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-09 04:27:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-09 04:50:56 +0200 |
| commit | 6841c8c5791e857a3327411f23c13b0d28f69f1f (patch) | |
| tree | 37f670ac509799ee0f4a067e2f632cc28a587082 /tests/lavf-regression.sh | |
| parent | 25308afbb2f7d6d9cb1e36476bc5aa0b3831c703 (diff) | |
| parent | 847aaec682f2bbfaac55ee623364dd4527e0f341 (diff) | |
| download | ffmpeg-6841c8c5791e857a3327411f23c13b0d28f69f1f.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
log: Fix an oob array read.
cosmetics: trim trailing whitespace in postproc
Ban strncpy() it's too easy to misuse.
psymodel: Remove wrapper functions.
aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
regtest: remove redundant flags in jpg test
regtest: use run_ffmpeg in do_image_formats
regtest: simplify encoding functions
ffmpeg.c: check for interlaced flag in the correct place.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/lavf-regression.sh')
| -rwxr-xr-x | tests/lavf-regression.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index b14a58efcd..7339c4e3c5 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -30,8 +30,7 @@ do_image_formats() outfile="$datadir/images/$1/" mkdir -p "$outfile" file=${outfile}%02d.$1 - $echov $ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact -sws_flags +accurate_rnd+bitexact $target_path/$file - $ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact -sws_flags +accurate_rnd+bitexact $target_path/$file + run_ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact -sws_flags +accurate_rnd+bitexact $target_path/$file do_md5sum ${outfile}02.$1 >> $logfile do_ffmpeg_crc $file $3 -i $target_path/$file wc -c ${outfile}02.$1 >> $logfile @@ -169,7 +168,7 @@ do_image_formats sgi fi if [ -n "$do_jpg" ] ; then -do_image_formats jpg "-flags +bitexact -dct fastint -idct simple -pix_fmt yuvj420p" "-f image2" +do_image_formats jpg "-pix_fmt yuvj420p" "-f image2" fi if [ -n "$do_pcx" ] ; then |