Merge commit '4d1f31ea'
* commit '4d1f31ea': lavfi: make AVFilterContext export filter options. Conflicts: libavfilter/avfilter.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '4d1f31ea': lavfi: make AVFilterContext export filter options. Conflicts: libavfilter/avfilter.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>