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