Commit 550defe1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b333f3a2'

* commit 'b333f3a2':
  lavf-regression: use -frames instead of -t for image tests

Conflicts:
	tests/lavf-regression.sh
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2ee29b5f b333f3a2
...@@ -50,7 +50,7 @@ do_image_formats() ...@@ -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)
......
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