[FFmpeg-cvslog] Merge remote-tracking branch 'origin/master'
Michael Niedermayer
git at videolan.org
Mon Jan 5 16:03:41 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 5 15:55:40 2015 +0100| [0e1c827e842c0a86eb32de853162d97e214e2b23] | committer: Michael Niedermayer
Merge remote-tracking branch 'origin/master'
* origin/master:
libavfilter/vf_blend: do not unconditionally compile both filters
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e1c827e842c0a86eb32de853162d97e214e2b23
---
More information about the ffmpeg-cvslog
mailing list