Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames
Conflicts:
libavcodec/libopenjpegdec.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录