[FFmpeg-cvslog] Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'
Michael Niedermayer
git at videolan.org
Wed Apr 10 21:14:09 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 20:48:46 2013 +0200| [1ee9eacaa492a0f38ae426439516574f4bfae4d9] | committer: Michael Niedermayer
Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'
* commit '7ed833d78ea661d619124fd898547a900f6480bc':
vf_gradfun: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/gradfun.h
libavfilter/vf_gradfun.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ee9eacaa492a0f38ae426439516574f4bfae4d9
---
More information about the ffmpeg-cvslog
mailing list