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
..
acodec	lswr: Improve default resampler's default parameters	2013-01-04 16:47:57 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2013-04-22 20:00:54 +02:00
lavf	lavf/gif: correct the delay after the first frame.	2013-04-19 12:02:19 +02:00
lavf-fate	mp3dec: Fix VBR bit rate parsing	2013-03-05 13:06:01 +01:00
lavfi	tests: add overlay rgb and yuv444 tests	2013-03-05 13:20:13 +01:00
seek	Cleanse GIF muxer and encoder.	2013-04-18 00:24:25 +02:00
vsynth	avcodec: rename prores encoders	2013-04-11 23:13:34 +02:00
vsynth1	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6'	2012-05-30 01:40:54 +02:00