[FFmpeg-cvslog] Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'
Michael Niedermayer
git at videolan.org
Wed Apr 10 17:44:06 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 17:13:29 2013 +0200| [1c3cdf533ba0f47e70b166b335fe3282264950d7] | committer: Michael Niedermayer
Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'
* commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd':
vf_cropdetect: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_cropdetect.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c3cdf533ba0f47e70b166b335fe3282264950d7
---
More information about the ffmpeg-cvslog
mailing list