summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2012-09-12 17:09:31 +0200
committerJustin Ruggles <justin.ruggles@gmail.com>2012-09-12 18:26:53 -0400
commit8919fee7d259a4f8feb2aac6941ac21915be7b6e (patch)
treec5d62bb0cd103c5eca2ca44d6fe4ce9253956590 /libavutil
parent07584eaf4a95db3f11d3bc411f9786932829e82b (diff)
lavu/audioconvert: add a second low frequency channel.
Can be used by DTS-HD, TrueHD and E-AC-3, among others. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/audioconvert.c1
-rw-r--r--libavutil/audioconvert.h1
-rw-r--r--libavutil/version.h2
3 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 09750ff435..113b9d782d 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -53,6 +53,7 @@ static const char * const 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 7e79097855..73076cba79 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 293a65b08f..6342baefb2 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -37,7 +37,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 40
+#define LIBAVUTIL_VERSION_MINOR 41
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \