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