Mercurial > libavcodec.hg
changeset 12425:d23e48091c51 libavcodec
Implement avcodec_get_channel_layout().
Patch by S.N. Hemanth Meenakshisundaram smeenaks:ucsd+edu.
| author | stefano |
|---|---|
| date | Thu, 26 Aug 2010 00:38:25 +0000 |
| parents | fbdc4391dedc |
| children | 7defcfe74c72 |
| files | audioconvert.c audioconvert.h avcodec.h |
| diffstat | 3 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/audioconvert.c Wed Aug 25 20:36:35 2010 +0000 +++ b/audioconvert.c Thu Aug 26 00:38:25 2010 +0000 @@ -121,6 +121,18 @@ { 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;
--- a/audioconvert.h Wed Aug 25 20:36:35 2010 +0000 +++ b/audioconvert.h Thu Aug 26 00:38:25 2010 +0000 @@ -60,6 +60,11 @@ 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 */ void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
--- a/avcodec.h Wed Aug 25 20:36:35 2010 +0000 +++ b/avcodec.h Thu Aug 26 00:38:25 2010 +0000 @@ -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, \