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
..
fate	Merge remote-tracking branch 'qatar/master'	2013-04-22 20:00:54 +02:00
filtergraphs	Merge commit 'ba8efac977'	2013-04-11 02:10:12 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2013-04-22 20:00:54 +02:00
audiogen.c	Merge commit '511cf612ac'	2012-12-21 17:32:52 +01:00
base64.c
copycooker.sh
fate-run.sh	fate: Print correct error message for reference generation too	2013-03-30 11:41:58 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	fate/gif: create meaningful gif encoding tests.	2013-04-19 02:05:01 +02:00
lavfi-regression.sh	lavfi/aspect: switch to an AVOptions-based system.	2013-04-11 22:05:03 +02:00
lena.pnm
Makefile	Merge commit 'a77aed142c'	2013-04-19 23:26:55 +02:00
md5.sh
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c
tiny_ssim.c	tests/tiny_ssim: include the 2 macros instead of a header	2013-03-27 01:38:18 +01:00
utils.c
videogen.c