# HG changeset patch
# User alexc
# Date 1257971063 0
# Node ID d7ac0d3ddd9586c504f484a7d5630d3fd7707375
# Parent  5317dff91b485b4cb6f3da8c54471be001633582
Add a channels field to MPEG4AudioConfig.

diff -r 5317dff91b48 -r d7ac0d3ddd95 avcodec.h
--- a/avcodec.h	Wed Nov 11 11:00:50 2009 +0000
+++ b/avcodec.h	Wed Nov 11 20:24:23 2009 +0000
@@ -30,8 +30,8 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 38
-#define LIBAVCODEC_VERSION_MICRO  1
+#define LIBAVCODEC_VERSION_MINOR 39
+#define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \
diff -r 5317dff91b48 -r d7ac0d3ddd95 mpeg4audio.c
--- a/mpeg4audio.c	Wed Nov 11 11:00:50 2009 +0000
+++ b/mpeg4audio.c	Wed Nov 11 20:24:23 2009 +0000
@@ -57,6 +57,8 @@
     c->object_type = get_object_type(&gb);
     c->sample_rate = get_sample_rate(&gb, &c->sampling_index);
     c->chan_config = get_bits(&gb, 4);
+    if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
+        c->channels = ff_mpeg4audio_channels[c->chan_config];
     c->sbr = -1;
     if (c->object_type == AOT_SBR) {
         c->ext_object_type = c->object_type;
diff -r 5317dff91b48 -r d7ac0d3ddd95 mpeg4audio.h
--- a/mpeg4audio.h	Wed Nov 11 11:00:50 2009 +0000
+++ b/mpeg4audio.h	Wed Nov 11 20:24:23 2009 +0000
@@ -36,6 +36,7 @@
     int ext_sampling_index;
     int ext_sample_rate;
     int ext_chan_config;
+    int channels;
 } MPEG4AudioConfig;
 
 extern const int ff_mpeg4audio_sample_rates[16];