[FFmpeg-cvslog] Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 11:41:48 2013 +0200| [550defe16eeae2819f19751d9e323713999d9a65] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=550defe16eeae2819f19751d9e323713999d9a65
---