[FFmpeg-soc] [soc]: r2786 - aac/aac.c

[superdump]

Author: superdump
Date: Tue Jul 15 14:09:56 2008
New Revision: 2786

Log:
Bug: 'channels' would not be correclty incremented if channel configuration
changed and che[][] had already been allocated. Allocation check separated into
the code block.


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Tue Jul 15 14:09:56 2008
@@ -542,7 +542,8 @@ static int output_configure(AACContext *
 
     for(i = 0; i < MAX_TAGID; i++) {
         for(j = 0; j < 4; j++) {
-            if(pcs->che_type[j][i] && !ac->che[j][i]) {
+            if(pcs->che_type[j][i]) {
+                if(!ac->che[j][i])
                 ac->che[j][i] = av_mallocz(sizeof(ChannelElement));
                 if(j != ID_CCE) {
                     ac->output_data[channels++] = ac->che[j][i]->ch[0].ret;