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