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