[FFmpeg-cvslog] Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'
Michael Niedermayer
git at videolan.org
Tue Apr 21 20:28:06 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 21 20:20:58 2015 +0200| [122150168f7d2a1bdc5c208505366d1a9e9c3892] | committer: Michael Niedermayer
Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'
* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
drawtext: Add an alpha option
Conflicts:
doc/filters.texi
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=122150168f7d2a1bdc5c208505366d1a9e9c3892
---
More information about the ffmpeg-cvslog
mailing list