[FFmpeg-cvslog] Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'
Michael Niedermayer
git at videolan.org
Wed Apr 10 17:02:09 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 16:56:33 2013 +0200| [200e04c70f9a77fd117d4ebb9d0fad9656514979] | committer: Michael Niedermayer
Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'
* commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891':
vf_crop: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_crop.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=200e04c70f9a77fd117d4ebb9d0fad9656514979
---
More information about the ffmpeg-cvslog
mailing list