[FFmpeg-cvslog] Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'
Michael Niedermayer
git at videolan.org
Wed May 20 19:23:56 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 20 19:03:51 2015 +0200| [6b783d2acea049d3ebbfe1352b55c8efe8b5168c] | committer: Michael Niedermayer
Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'
* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
lavfi: Move avcodec header to the only filter needing it
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b783d2acea049d3ebbfe1352b55c8efe8b5168c
---
More information about the ffmpeg-cvslog
mailing list