[FFmpeg-cvslog] Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'
Michael Niedermayer
git at videolan.org
Wed Apr 10 22:14:55 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 21:54:13 2013 +0200| [8bdb119197ad50a5ede2326e3c0942dc82ba1b5e] | committer: Michael Niedermayer
Merge commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6'
* commit '20b46f8f4fff6aeeab9ea418dc359eda8887ced6':
vf_lut: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bdb119197ad50a5ede2326e3c0942dc82ba1b5e
---
More information about the ffmpeg-cvslog
mailing list