[FFmpeg-cvslog] Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 10:02:07 2013 +0200| [ef29a95a4d60febcc7f01fbebd9969d1c8793588] | committer: Michael Niedermayer

Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'

* commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1':
  vsrc_testsrc: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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