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-04 04:38:28 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-06-03 01:53:36 +02:00
2012-08-09 00:02:05 +00:00
2012-08-15 22:32:06 +03:00
2012-09-01 15:23:39 +02:00
2012-09-10 17:08:18 +02:00
2012-08-14 18:58:49 +02:00
2012-09-11 07:13:49 +02:00
2012-08-07 23:57:21 +02:00
2012-05-18 23:34:11 +02:00
2012-08-27 18:31:21 +02:00
2012-08-25 03:55:50 +02:00
2012-08-09 11:22:11 +02:00
2012-08-15 22:32:06 +03:00
2012-09-04 18:37:54 +03:00
2012-08-15 22:32:06 +03:00
2012-09-07 12:36:00 +02:00
2012-07-19 18:44:46 +02:00
2012-07-26 16:33:17 +02:00
2012-06-07 21:07:17 +02:00
2012-08-13 04:58:15 +02:00
2012-07-10 02:17:52 +02:00
2012-09-09 13:02:08 +02:00
2012-06-10 23:27:17 +02:00
2012-05-18 23:34:11 +02:00
2012-04-22 22:26:55 +02:00
2012-07-22 05:18:01 +02:00
2012-05-18 23:34:11 +02:00
2012-09-03 23:26:14 +02:00
2012-09-03 23:23:40 +02:00
2012-08-15 05:29:28 +02:00
2012-06-17 17:09:34 +02:00
2012-07-05 02:54:34 +00:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-06-29 20:43:30 +02:00
2012-07-29 22:02:46 +02:00
2012-09-10 21:04:01 +02:00
2012-06-10 23:36:22 +02:00
2012-06-24 20:18:00 +02:00
2012-08-15 22:32:06 +03:00
2012-06-21 01:30:16 +00:00
2012-08-12 05:32:07 +02:00
2012-09-03 01:26:57 +02:00
2012-08-18 09:52:15 +02:00
2012-08-28 04:07:53 +02:00
2012-08-14 21:22:20 +02:00
2012-06-29 20:43:30 +02:00
2012-08-30 02:34:00 +02:00