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