[FFmpeg-cvslog] Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'
Michael Niedermayer
git at videolan.org
Thu Apr 11 10:48:30 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 10:42:49 2013 +0200| [0965be00fe20e30912b3f51a32a3e435e9996f3e] | committer: Michael Niedermayer
Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'
* commit '4d1f31ea44f82adfb2b712534d71e27233a4f785':
lavfi: make AVFilterContext export filter options.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0965be00fe20e30912b3f51a32a3e435e9996f3e
---
More information about the ffmpeg-cvslog
mailing list