1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Michael Niedermayer ef29a95a4d 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@gmx.at>
2013-04-11 10:02:07 +02:00
..
2013-04-10 12:09:20 +02:00
2013-03-31 22:34:13 +02:00
2013-03-22 09:20:45 +01:00
2013-03-31 18:22:08 -04:00
2013-04-03 21:07:15 +02:00
2013-01-21 10:24:45 +00:00
2013-01-06 16:30:02 +01:00
2013-01-06 16:30:02 +01:00
2013-02-14 23:45:48 +01:00