Merge commit 'd2585315'
* commit 'd2585315': swscale: Mark a bunch of tables only used within one file static Conflicts: libswscale/swscale_unscaled.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit 'd2585315': swscale: Mark a bunch of tables only used within one file static Conflicts: libswscale/swscale_unscaled.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>