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

[superdump]

Author: superdump
Date: Tue Jul 15 15:40:54 2008
New Revision: 2790

Log:
Simplification


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Tue Jul 15 15:40:54 2008
@@ -565,12 +565,10 @@ static int output_configure(AACContext *
     }
 
     // allocate appropriately aligned buffer for interleaved output
+    if(channels > avctx->channels)
+        av_freep(&ac->interleaved_output);
     if(!ac->interleaved_output)
         ac->interleaved_output = av_malloc(channels * 1024 * sizeof(float));
-    else if(channels > avctx->channels) {
-        av_free(ac->interleaved_output);
-        ac->interleaved_output = av_malloc(channels * 1024 * sizeof(float));
-    }
 
     ac->mm[MIXDOWN_FRONT] = ac->mm[MIXDOWN_BACK] = ac->mm[MIXDOWN_CENTER] = NULL;