Michael Niedermayer
3c033d00f5
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: introduce lowres and lowqual private options
FATE: add a test for flac cover art.
cafdec: allow larger ALAC magic cookie
alac: fix channel pointer assignment for 24 and 32-bit
Conflicts:
libavcodec/alac.c
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 04:25:11 +02:00
..
2012-07-19 18:44:46 +02:00
2012-07-18 22:34:48 +02:00
2012-07-19 22:01:31 +02:00
2012-07-21 04:25:11 +02:00
2012-07-20 11:18:58 +02:00
2012-07-20 11:16:52 +02:00
2012-07-16 16:06:01 +02:00
2012-07-12 23:57:00 +02:00
2012-07-20 15:24:27 +02:00
2012-07-18 22:34:48 +02:00
2012-07-18 22:34:48 +02:00
2012-07-20 18:13:25 +00:00
2012-07-19 18:44:46 +02:00
2012-07-12 23:57:00 +02:00
2012-07-16 16:48:09 +02:00
2012-07-12 23:57:00 +02:00
2012-07-19 22:01:31 +02:00
2012-07-19 22:01:31 +02:00
2012-07-15 14:49:32 +02:00
2012-07-18 17:22:17 +02:00
2012-07-14 03:49:11 +02:00
2012-07-12 23:18:48 +02:00
2012-07-16 20:45:41 +02:00
2012-07-17 08:53:36 +02:00
2012-07-21 04:25:11 +02:00
2012-07-18 01:27:19 +02:00
2012-07-20 11:18:58 +02:00
2012-07-14 13:37:50 +02:00
2012-07-20 11:18:58 +02:00
2012-07-18 16:22:41 +02:00
2012-07-14 14:50:02 -07:00
2012-07-17 08:12:49 +02:00
2012-07-15 02:12:02 +00:00
2012-07-13 22:22:24 +02:00
2012-07-13 20:35:08 +02:00
2012-07-19 19:08:36 +02:00
2012-07-17 17:06:24 +00:00
2012-07-15 14:49:32 +02:00
2012-07-16 01:32:52 +02:00
2012-07-20 19:44:26 +00:00
2012-07-14 13:02:38 +02:00
2012-07-14 13:02:38 +02:00
2012-07-17 01:23:35 +00:00
2012-07-17 01:23:35 +00:00
2012-07-14 13:02:51 +02:00
2012-07-18 22:34:48 +02:00
2012-07-11 23:57:11 +02:00
2012-07-20 13:16:23 +02:00
2012-07-16 01:32:52 +02:00
2012-07-20 11:18:58 +02:00
2012-07-11 23:26:55 +02:00
2012-07-18 22:34:48 +02:00
2012-07-18 22:34:48 +02:00
2012-07-18 22:34:48 +02:00
2012-07-16 01:32:52 +02:00
2012-07-16 01:32:52 +02:00
2012-07-18 22:34:48 +02:00
2012-07-18 22:34:48 +02:00
2012-07-14 03:02:03 +02:00