diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:41:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:41:48 +0200 |
| commit | 550defe16eeae2819f19751d9e323713999d9a65 (patch) | |
| tree | 8d2ef319a0dff769ae1a21ffc00cbce911fccfcf | |
| parent | 2ee29b5fb936764785059eac391bc474cb16ac0c (diff) | |
| parent | b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44 (diff) | |
| download | ffmpeg-550defe16eeae2819f19751d9e323713999d9a65.tar.gz | |
Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44'
* commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44':
lavf-regression: use -frames instead of -t for image tests
Conflicts:
tests/lavf-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | tests/lavf-regression.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 196e9654d7..837d9b4395 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -50,7 +50,7 @@ do_image_formats() outfile="$datadir/images/$1/" mkdir -p "$outfile" file=${outfile}%02d.$1 - run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS -t 0.5 -y -qscale 10 $target_path/$file + run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS -frames 13 -y -qscale 10 $target_path/$file do_md5sum ${outfile}02.$1 do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3 echo $(wc -c ${outfile}02.$1) |