Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Sep 2012 13:35:50 +0000 (15:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Sep 2012 13:35:50 +0000 (15:35 +0200)
commite3e09f2bad12fae4d2449cebb6130e2cf2266083
tree4e62dffcef37727e4cfa2507bacd5b9fb225341d
parentc942e8b1d75243b97db24e0c75f7d5c7b9d585eb
parentca6b544ac9d07dcd4d151d5729f0bf52f4f8653d
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>
16 files changed:
configure
doc/APIchanges
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/mlp_parser.c
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/dsputil_mmx.c
libavformat/os_support.h
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/version.h
libswscale/swscale.c