Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 01:10:43 +0000 (03:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 01:10:43 +0000 (03:10 +0200)
commit8bafd83aaafad42e64acfe3646e5b4b3597982fd
treeca2cfec73b00ad3412b8fb042035213c0afb6255
parent7f2198a2f1cf24c8df6709058f9e6f3d69c44f7a
parent7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe
Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'

* commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe':
  vsrc_color: switch to an AVOptions-based system.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfilter.c
libavfilter/vsrc_testsrc.c