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

superdump subversion at mplayerhq.hu
Mon Jul 28 11:09:46 CEST 2008


Author: superdump
Date: Mon Jul 28 11:09:46 2008
New Revision: 2879

Log:
pulse.present only used locally so use local variable and remove member from
struct


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Mon Jul 28 11:09:46 2008
@@ -289,7 +289,6 @@ typedef struct {
  * pulse tool
  */
 typedef struct {
-    int present;
     int num_pulse;
     int start;
     int offset[4];
@@ -1372,7 +1371,7 @@ static int decode_ics(AACContext * ac, G
     TemporalNoiseShaping * tns = &sce->tns;
     IndividualChannelStream * ics = &sce->ics;
     float * out = sce->coeffs;
-    int global_gain;
+    int global_gain, pulse_present = 0;
 
     global_gain = get_bits(gb, 8);
 
@@ -1386,9 +1385,9 @@ static int decode_ics(AACContext * ac, G
     if (decode_scalefactors(ac, gb, sce->mixing_gain, global_gain, ics, sce->band_type, sce->band_type_run_end, sce->sf) < 0)
         return -1;
 
-    pulse.present = 0;
+    pulse_present = 0;
     if (!scale_flag) {
-        if ((pulse.present = get_bits1(gb))) {
+        if ((pulse_present = get_bits1(gb))) {
             if (ics->window_sequence == EIGHT_SHORT_SEQUENCE) {
                 av_log(ac->avccontext, AV_LOG_ERROR, "Pulse tool not allowed in eight short sequence.\n");
                 return -1;
@@ -1410,7 +1409,7 @@ static int decode_ics(AACContext * ac, G
 
     if (decode_spectrum(ac, gb, ics, sce->band_type, icoeffs) < 0)
         return -1;
-    if (pulse.present)
+    if (pulse_present)
         add_pulses(ac, ics, &pulse, icoeffs);
     dequant(ac, ics, icoeffs, sce->band_type, sce->sf, out);
     return 0;



More information about the FFmpeg-soc mailing list