[FFmpeg-cvslog] lavu/audioconvert: add a second low frequency channel.

[Tim Walker]

ffmpeg | branch: master | Tim Walker <tdskywalker at gmail.com> | Wed Sep 12 17:09:31 2012 +0200| [8919fee7d259a4f8feb2aac6941ac21915be7b6e] | committer: Justin Ruggles

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8919fee7d259a4f8feb2aac6941ac21915be7b6e
---

 doc/APIchanges           |    3 +++
 libavutil/audioconvert.c |    1 +
 libavutil/audioconvert.h |    1 +
 libavutil/version.h      |    2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 7e1ffd0..48fe097 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil:     2011-04-18
 
 API changes, most recent first:
 
+2012-09-12 - xxxxxxx - lavu 51.41.0 - audioconvert.h
+  Added AV_CH_LOW_FREQUENCY_2 channel mask value.
+
 2012-09-04 - xxxxxxx - lavu 51.40.0 - opt.h
   Reordered the fields in default_val in AVOption, changed which
   default_val field is used for which AVOptionType.
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 09750ff..113b9d7 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 7e79097..73076cb 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 293a65b..6342bae 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, \