From 5da19b53c6e16c6ff86ee9aab4f8d0b4b1c3be5d Mon Sep 17 00:00:00 2001
From: "S.N. Hemanth Meenakshisundaram" <smeenaks@ucsd.edu>
Date: Thu, 26 Aug 2010 00:38:25 +0000
Subject: [PATCH] Implement avcodec_get_channel_layout().
Patch by S.N. Hemanth Meenakshisundaram smeenaks:ucsd+edu.
Originally committed as revision 24936 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/audioconvert.c | 12 ++++++++++++
libavcodec/audioconvert.h | 5 +++++
libavcodec/avcodec.h | 4 ++--
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index d022bc9ee3e..c6dc1b1c2a0 100644
--- a/libavcodec/audioconvert.c
+++ b/libavcodec/audioconvert.c
@@ -121,6 +121,18 @@ static const struct {
{ 0 }
};
+int64_t avcodec_get_channel_layout(const char *name)
+{
+ int i = 0;
+ do {
+ if (!strcmp(channel_layout_map[i].name, name))
+ return channel_layout_map[i].layout;
+ i++;
+ } while (channel_layout_map[i].name);
+
+ return 0;
+}
+
void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout)
{
int i;
diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index 81b6cded39a..1f93b5c336b 100644
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@@ -59,6 +59,11 @@ enum SampleFormat avcodec_get_sample_fmt(const char* name);
*/
const char *avcodec_get_channel_name(int channel_id);
+/**
+ * @return channel layout that matches name, 0 if no match
+ */
+int64_t avcodec_get_channel_layout(const char *name);
+
/**
* Return description of channel layout
*/
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 042b5c9945d..620f4ece241 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,8 +30,8 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 86
-#define LIBAVCODEC_VERSION_MICRO 1
+#define LIBAVCODEC_VERSION_MINOR 87
+#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
--
GitLab