Michael Niedermayer
e3e09f2bad
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
os_support: Choose between direct.h and io.h using a configure check
os_support: Include io.h instead of direct.h on mingw32ce
x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
swscale: Remove two bogus asserts
ac3: move ac3_downmix() from dsputil to ac3dsp
lavr/audio_mix_matrix: acknowledge the existence of LFE2.
mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
lavu/audioconvert: add a second low frequency channel.
Conflicts:
doc/APIchanges
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
libavcodec/mlp_parser.c
libavutil/audioconvert.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-13 15:35:50 +02:00
..
2012-09-09 03:55:56 +02:00
2012-09-09 03:55:56 +02:00
2012-09-09 03:55:56 +02:00
2012-09-05 20:09:56 +02:00
2012-09-09 03:55:56 +02:00
2012-09-13 15:35:50 +02:00
2012-09-11 03:02:51 +02:00
2012-09-05 14:33:32 +02:00
2012-09-09 13:02:08 +02:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2012-09-05 21:56:41 +02:00
2012-09-06 01:18:55 +02:00
2012-09-05 14:33:32 +02:00
2012-09-09 14:19:02 +02:00
2012-09-10 22:32:56 +02:00
2012-09-10 17:08:18 +02:00
2012-09-10 14:06:20 +02:00
2012-09-11 07:13:49 +02:00
2012-09-08 12:53:44 +02:00
2012-09-08 12:53:44 +02:00
2012-09-05 14:33:32 +02:00
2012-09-08 23:57:37 +02:00
2012-09-09 03:55:56 +02:00
2012-09-09 17:21:37 +02:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2012-09-07 12:36:00 +02:00
2012-09-05 20:09:56 +02:00
2012-09-05 20:09:56 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-08 05:36:34 +02:00
2012-09-11 01:15:10 +02:00
2012-09-05 20:09:56 +02:00
2012-09-05 20:09:56 +02:00
2012-09-05 21:03:17 +02:00
2012-09-05 14:33:32 +02:00
2012-09-11 01:15:10 +02:00
2012-09-06 16:05:40 +02:00
2012-09-09 13:02:08 +02:00
2012-09-05 18:44:42 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-07 09:59:12 +02:00
2012-09-05 14:44:05 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 14:06:20 +02:00
2012-09-13 15:35:50 +02:00
2012-09-09 03:15:46 +02:00
2012-09-10 14:06:20 +02:00
2012-09-05 14:33:32 +02:00
2012-09-10 22:34:18 +02:00
2012-09-11 17:50:14 +02:00
2012-09-07 13:50:24 +02:00
2012-09-11 17:50:14 +02:00
2012-09-07 13:50:24 +02:00
2012-09-07 13:50:24 +02:00
2012-09-10 17:08:18 +02:00
2012-09-11 17:50:14 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 16:01:40 +03:00
2012-09-05 14:33:32 +02:00
2012-09-10 15:15:40 +02:00
2012-09-07 19:38:23 +02:00
2012-09-07 19:38:23 +02:00
2012-09-05 20:54:50 +02:00
2012-09-05 14:33:32 +02:00
2012-09-10 14:06:20 +02:00
2012-09-10 21:04:01 +02:00
2012-09-11 17:50:14 +02:00
2012-09-06 23:39:57 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-09 14:19:02 +02:00
2012-09-12 13:33:57 +02:00
2012-09-05 14:33:32 +02:00
2012-09-12 11:46:47 +02:00
2012-09-12 21:12:18 +02:00
2012-09-12 21:12:18 +02:00
2012-09-07 01:36:21 +02:00