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-03-08 02:44:07 +01:00
2013-01-21 14:22:04 +01:00
2012-12-03 02:33:27 +01:00
2012-11-29 13:24:48 +00:00
2012-11-20 00:26:46 -05:00
2012-10-18 13:12:28 +01:00
2012-11-14 15:09:59 +01:00
2012-11-14 15:09:59 +01:00
2012-11-14 15:09:59 +01:00
2013-03-09 15:46:46 +01:00
2013-03-09 14:39:13 +01:00
2013-03-09 15:46:46 +01:00
2012-12-04 15:24:05 +01:00
2013-01-12 17:19:27 +01:00
2013-03-09 15:46:46 +01:00
2013-03-09 15:46:46 +01:00
2012-12-04 15:24:05 +01:00
2012-12-07 11:34:16 +01:00
2012-12-04 14:23:22 +01:00
2013-04-11 13:09:33 +02:00
2012-09-22 09:34:56 +02:00
2012-12-03 01:34:14 +01:00
2013-04-22 14:54:38 +02:00
2013-04-19 23:34:58 +02:00
2013-03-08 02:44:46 +01:00
2013-04-19 02:05:01 +02:00
2013-03-23 22:33:11 +01:00
2013-03-05 11:44:58 +00:00
2012-10-18 13:12:28 +01:00
2012-10-23 10:52:15 +02:00
2013-02-27 21:32:14 +02:00
2013-03-08 15:48:27 +01:00
2013-02-14 17:48:08 +01:00
2013-01-13 13:42:10 +01:00
2013-03-12 21:06:30 +01:00
2012-12-05 13:34:45 +01:00
2012-10-18 13:12:28 +01:00
2013-03-09 15:46:46 +01:00
2013-03-09 15:46:46 +01:00
2012-11-29 13:35:56 +01:00
2012-10-19 14:15:47 +02:00
2012-11-28 14:45:28 +01:00
2013-03-12 21:06:30 +01:00
2013-03-23 12:26:08 +01:00
2013-01-13 13:42:10 +01:00
2013-02-28 01:23:24 +01:00
2013-04-19 22:55:21 +02:00
2013-04-22 19:28:33 +02:00
2013-04-22 20:00:54 +02:00
2013-03-08 02:45:27 +01:00
2012-11-28 14:45:28 +01:00
2013-04-16 01:02:14 +02:00
2012-10-19 13:47:47 +02:00
2013-01-12 17:19:27 +01:00
2012-10-23 10:28:40 +02:00