[FFmpeg-cvslog] Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'
Michael Niedermayer
git at videolan.org
Fri Apr 12 00:51:33 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 00:44:18 2013 +0200| [4fde705396759ad96a662a400d5f1667c19c614b] | committer: Michael Niedermayer
Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
lavfi: add AVFilterContext.graph.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fde705396759ad96a662a400d5f1667c19c614b
---
More information about the ffmpeg-cvslog
mailing list