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