[FFmpeg-cvslog] Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'
Michael Niedermayer
git at videolan.org
Thu Apr 11 03:15:53 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 03:10:43 2013 +0200| [8bafd83aaafad42e64acfe3646e5b4b3597982fd] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bafd83aaafad42e64acfe3646e5b4b3597982fd
---
More information about the ffmpeg-cvslog
mailing list