• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e2e9bee2
    Michael Niedermayer authored
    * qatar/master:
      avcodec: Bump minor for JPEG 2000 decoder
      JPEG 2000 decoder for DCinema
    
    The mqc code is merged, the rest is added independent of
    the existing jpeg2000 decoder and encoder.
    
    Conflicts:
    	Changelog
    	doc/general.texi
    	libavcodec/Makefile
    	libavcodec/allcodecs.c
    	libavcodec/mqc.c
    	libavcodec/mqc.h
    	libavcodec/mqcdec.c
    	libavcodec/version.h
    	tests/fate/video.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e2e9bee2
video.mak 12.4 KB