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

superdump subversion at mplayerhq.hu
Tue May 27 15:24:36 CEST 2008


Author: superdump
Date: Tue May 27 15:24:35 2008
New Revision: 2234

Log:
Move check for presence before call to intensity_tool


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Tue May 27 15:24:35 2008
@@ -1390,7 +1390,6 @@ static void intensity_tool(AACContext * 
     const ics_struct * ics = &cpe->ch[1].ics;
     sce_struct * sce1 = &cpe->ch[1];
     float *coef0 = cpe->ch[0].coeffs, *coef1 = cpe->ch[1].coeffs;
-    if (ics->intensity_present) {
         const uint16_t * offsets = ics->swb_offset;
         int g, gp, i, k;
         int c;
@@ -1411,7 +1410,6 @@ static void intensity_tool(AACContext * 
                 coef1 += 128;
             }
         }
-    }
 }
 
 /**
@@ -1443,6 +1441,7 @@ static int decode_cpe(AACContext * ac, G
     if (cpe->common_window)
         ms_tool(ac, cpe);
 
+    if (cpe->ch[1].ics.intensity_present)
     intensity_tool(ac, cpe);
     return 0;
 }



More information about the FFmpeg-soc mailing list