angler-fishThe Vulnerability History Project

Merge remote-tracking branch 'qatar/master'

      * 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: Michael Niedermayer <michaelni@gmx.at>
    
commit e2e9bee2daef9d5d5169f5360737eec8b76d7e0c
-2
-1
-6
-478
-268
-1336
-371
-64
+66 -70
+9 -21
+11 -11
+1 -1
-3
-3
expand_less