Merge commit '335c3129'
* commit '335c3129': vf_drawbox: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_drawbox.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '335c3129': vf_drawbox: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_drawbox.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>