[FFmpeg-cvslog] Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'
Michael Niedermayer
git at videolan.org
Wed Apr 10 23:29:22 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 23:18:18 2013 +0200| [b3fb2d8cec91dadf935832f3bef97bf5a3a11352] | committer: Michael Niedermayer
Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'
* commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e':
vf_select: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_select.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3fb2d8cec91dadf935832f3bef97bf5a3a11352
---
More information about the ffmpeg-cvslog
mailing list