Merge commit '9b2c57be'
* commit '9b2c57be': drawtext: Add an alpha option Conflicts: doc/filters.texi libavfilter/vf_drawtext.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '9b2c57be': drawtext: Add an alpha option Conflicts: doc/filters.texi libavfilter/vf_drawtext.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>