Merge commit 'f86f39cb'
* commit 'f86f39cb': tiff: support decoding GBRP and GBRAP formats Conflicts: libavcodec/tiff.c See: 379ad978Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录
* commit 'f86f39cb': tiff: support decoding GBRP and GBRAP formats Conflicts: libavcodec/tiff.c See: 379ad978Merged-by: NMichael Niedermayer <michaelni@gmx.at>