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-17 17:09:19 +02:00
2012-07-10 00:04:23 +00:00
2012-05-09 14:13:34 +01:00
2012-07-10 00:04:24 +00:00
2012-05-09 14:13:34 +01:00
2012-07-08 13:41:39 +02:00
2012-05-09 14:13:34 +01:00
2012-07-10 00:04:23 +00:00
2012-06-18 11:47:08 +01:00