Michael Niedermayer
dd3ca3ea15
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: Add tests for more AAC features.
aacps: Add missing newline in error message.
fate: Add tests for vc1/wmapro in ism.
aacdec: Add a fate test for 5.1 channel SBR.
aacdec: Turn off PS for multichannel files that use PCE based configs.
cabac: remove put_cabac_u/ueg from cabac-test.
swscale: RGB4444 and BGR444 input
FATE: add test for xWMA demuxer.
FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder.
mpegaudiodec: optimized iMDCT transform
mpegaudiodec: change imdct window arrangment for better pointer alignment
mpegaudiodec: move imdct and windowing function to mpegaudiodsp
mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations
swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm.
FATE: test to exercise WTV demuxer.
mjpegdec: K&R formatting cosmetics
swscale: K&R formatting cosmetics for code examples
swscale: K&R reformatting cosmetics for header files
FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised.
Conflicts:
libavcodec/cabac.c
libavcodec/mjpegdec.c
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
libavcodec/mpegaudiodsp_template.c
libavcodec/x86/Makefile
libavcodec/x86/imdct36_sse.asm
libavcodec/x86/mpegaudiodec_mmx.c
libswscale/swscale-test.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/video.mak
tests/fate/wma.mak
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-10 03:50:41 +01:00
..
2011-11-09 01:58:22 +01:00
2011-11-09 01:58:22 +01:00
2011-04-12 19:06:26 -04:00
2011-12-13 15:46:23 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-12-14 20:09:46 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-08-21 20:57:24 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-06-30 09:47:32 +01:00
2011-11-23 21:58:30 +01:00
2011-04-12 19:06:26 -04:00
2010-03-15 19:23:24 +00:00
2011-02-25 15:24:35 -05:00
2012-01-07 11:10:58 -08:00
2010-03-15 19:23:24 +00:00
2011-11-23 21:58:10 +01:00
2011-12-28 22:05:24 +01:00
2011-04-12 19:06:26 -04:00
2011-07-03 17:17:54 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-12 20:47:33 +01:00
2010-03-15 19:23:24 +00:00
2011-09-16 21:29:58 +02:00
2011-09-11 17:44:20 +02:00
2012-01-08 14:20:04 -08:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-23 21:43:46 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2012-01-02 03:10:30 +01:00
2011-12-30 21:14:07 +01:00
2010-03-15 19:23:24 +00:00
2011-10-14 15:53:41 -04:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-08-31 11:11:25 +00:00
2012-01-03 23:16:29 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-12-17 15:49:25 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-09-23 00:35:31 +02:00
2010-08-28 11:46:03 +00:00
2010-08-28 11:46:03 +00:00
2011-08-17 20:00:06 +02:00
2011-08-26 20:54:36 +02:00
2011-11-23 21:43:46 +01:00
2011-11-13 14:50:01 +01:00
2010-03-15 19:23:24 +00:00
2011-11-13 14:50:01 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-09 00:06:08 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-09-11 10:23:02 +00:00
2011-10-18 10:45:22 +03:00
2011-09-30 00:13:26 +02:00
2011-09-30 00:13:26 +02:00
2010-10-02 09:56:21 +00:00
2010-10-02 09:56:21 +00:00
2012-01-07 11:04:46 -08:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-11-29 10:35:57 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-23 08:44:31 -04:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-05-11 16:47:47 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2011-08-23 14:29:36 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-01-24 22:26:13 +00:00
2010-11-04 21:48:54 +00:00
2011-12-10 22:02:44 +01:00
2010-03-15 19:23:24 +00:00
2011-04-12 19:06:26 -04:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-05-17 00:58:33 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-07-04 16:26:26 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2012-01-07 11:09:04 -08:00
2010-03-15 19:23:24 +00:00
2011-12-27 18:26:31 +01:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-08-17 20:00:06 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-10-20 13:09:46 -04:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-04 19:40:32 +01:00
2011-11-04 19:40:32 +01:00
2011-11-04 19:40:32 +01:00
2010-03-15 19:23:24 +00:00
2011-07-03 18:19:18 +01:00
2010-03-15 19:23:24 +00:00
2010-08-31 11:13:14 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-23 21:43:46 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-07-17 10:50:25 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-04-19 11:51:40 +00:00
2011-11-24 03:32:24 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-13 14:52:21 +01:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 19:48:41 +02:00
2011-10-14 21:34:20 +02:00
2011-10-15 14:59:44 +01:00
2011-04-12 19:06:26 -04:00
2011-03-26 16:39:22 -04:00
2011-03-26 16:39:22 -04:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-09-23 20:54:28 -04:00
2011-09-23 20:54:28 -04:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-12-07 21:11:51 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-09-13 17:29:23 +02:00
2011-12-15 14:34:09 +01:00
2010-03-15 19:23:24 +00:00
2011-08-17 20:00:06 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2011-08-17 15:00:42 +02:00
2010-08-31 20:07:38 +00:00
2010-03-15 19:23:24 +00:00
2011-04-12 19:06:26 -04:00
2011-04-12 19:06:26 -04:00
2011-09-14 11:13:54 +03:00
2011-01-14 22:32:26 +00:00
2012-01-08 18:31:50 -08:00
2010-03-15 19:23:24 +00:00
2010-12-28 23:52:53 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-23 21:43:46 +01:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2011-10-16 04:02:09 +02:00
2011-11-09 01:58:22 +01:00
2011-11-23 21:43:46 +01:00
2010-08-24 20:48:58 +00:00
2010-08-24 20:48:58 +00:00
2010-03-15 19:23:24 +00:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-12-10 15:29:53 +01:00
2011-09-07 12:16:15 +02:00
2011-12-15 13:31:40 +01:00
2011-12-15 13:31:40 +01:00
2011-12-03 01:50:07 +01:00
2011-05-04 07:40:53 -04:00
2011-12-29 15:32:31 +01:00
2011-12-29 15:32:31 +01:00
2011-12-29 15:32:31 +01:00
2012-01-09 11:04:17 -08:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-11-09 01:58:22 +01:00
2011-11-23 21:43:46 +01:00
2010-08-25 17:23:38 +00:00
2012-01-05 11:14:23 -08:00
2011-09-11 17:44:20 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-09-13 17:29:23 +02:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-07-12 20:24:23 +00:00
2010-07-12 20:24:23 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-07-12 20:24:23 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2011-12-15 21:28:54 +01:00
2010-04-13 14:29:13 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-12-13 23:21:37 +01:00
2011-04-12 19:06:26 -04:00
2012-01-08 17:26:24 +01:00
2010-03-15 19:23:24 +00:00
2010-08-28 14:51:51 +00:00
2012-01-08 14:53:35 -08:00
2012-01-07 11:21:27 -08:00
2012-01-08 18:33:59 -08:00
2012-01-07 11:06:53 -08:00
2011-11-12 20:49:53 +01:00
2010-03-15 19:23:24 +00:00
2011-09-11 17:44:20 +02:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00