Merge commit '92b099da'
* commit '92b099da': swscale: support converting YVYU422 pixel format Conflicts: libswscale/input.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit '92b099da': swscale: support converting YVYU422 pixel format Conflicts: libswscale/input.c Merged-by: NMichael Niedermayer <michaelni@gmx.at>