RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-05-03 11:41:48 +02:00
parent 2ee29b5fb9 b333f3a22a
commit 550defe16e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/lavf-regression.sh
View File

@ -50,7 +50,7 @@ do_image_formats()
outfile="$datadir/images/$1/" outfile="$datadir/images/$1/"
mkdir -p "$outfile" mkdir -p "$outfile"
file=${outfile}%02d.$1 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_md5sum ${outfile}02.$1
do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3 do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
echo $(wc -c ${outfile}02.$1) echo $(wc -c ${outfile}02.$1)