diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-13 15:35:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-13 15:35:50 +0200 |
| commit | e3e09f2bad12fae4d2449cebb6130e2cf2266083 (patch) | |
| tree | 4e62dffcef37727e4cfa2507bacd5b9fb225341d /libavcodec/mpegaudiodata.c | |
| parent | c942e8b1d75243b97db24e0c75f7d5c7b9d585eb (diff) | |
| parent | ca6b544ac9d07dcd4d151d5729f0bf52f4f8653d (diff) | |
| download | ffmpeg-e3e09f2bad12fae4d2449cebb6130e2cf2266083.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mpegaudiodata.c')
0 files changed, 0 insertions, 0 deletions