Merge commit '82f8eb5f'
* commit '82f8eb5f': jpeg2000: split off inverse MCT as Jpeg2000DSP Conflicts: libavcodec/Makefile libavcodec/jpeg2000dec.c libavcodec/jpeg2000dsp.c libavcodec/jpeg2000dsp.h See: c9f2ec8aMerged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
想要评论请 注册 或 登录