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 /libavutil | |
| parent | c942e8b1d75243b97db24e0c75f7d5c7b9d585eb (diff) | |
| parent | ca6b544ac9d07dcd4d151d5729f0bf52f4f8653d (diff) | |
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 'libavutil')
| -rw-r--r-- | libavutil/audioconvert.c | 1 | ||||
| -rw-r--r-- | libavutil/audioconvert.h | 1 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index 4f6f7e3234..caab5e6910 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -59,6 +59,7 @@ static const struct channel_name channel_names[] = { [32] = { "WR", "wide right" }, [33] = { "SDL", "surround direct left" }, [34] = { "SDR", "surround direct right" }, + [35] = { "LFE2", "low frequency 2" }, }; static const char *get_channel_name(int channel_id) diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h index 5ddda0cbc5..76eb2783b5 100644 --- a/libavutil/audioconvert.h +++ b/libavutil/audioconvert.h @@ -62,6 +62,7 @@ #define AV_CH_WIDE_RIGHT 0x0000000100000000ULL #define AV_CH_SURROUND_DIRECT_LEFT 0x0000000200000000ULL #define AV_CH_SURROUND_DIRECT_RIGHT 0x0000000400000000ULL +#define AV_CH_LOW_FREQUENCY_2 0x0000000800000000ULL /** Channel mask value used for AVCodecContext.request_channel_layout to indicate that the user requests the channel order of the decoder output diff --git a/libavutil/version.h b/libavutil/version.h index dbfec109aa..ac2c09d17d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -39,7 +39,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 72 +#define LIBAVUTIL_VERSION_MINOR 73 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |