FFmpeg/libavcodec
Michael Niedermayer e2e9bee2da 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>
2013-04-22 20:00:54 +02:00
..
2013-04-21 11:55:19 +02:00
2013-04-19 13:15:54 +02:00
2013-04-19 23:59:22 +02:00
2013-04-20 00:05:35 +02:00
2013-04-19 01:26:54 +02:00
2013-04-22 12:05:09 +02:00
2013-04-20 02:22:32 +02:00
2013-04-18 01:55:42 +02:00