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

[superdump]

Author: superdump
Date: Fri Aug  8 14:53:38 2008
New Revision: 3084

Log:
Indentation and whitespace changes


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Fri Aug  8 14:53:38 2008
@@ -205,7 +205,6 @@ static int output_configure(AACContext *
     return 0;
 }
 
-
 /**
  * Decode an array of 4 bit tag IDs, optionally interleaved with a stereo/mono switching bit.
  *
@@ -221,7 +220,6 @@ static void program_config_element_parse
     }
 }
 
-
 /**
  * Parse program configuration element; reference: table 4.2.
  */
@@ -300,7 +298,7 @@ static int set_pce_to_defaults(AACContex
         new_che_pos[ID_SCE][1] = AAC_CHANNEL_BACK;  // back center
     if(channel_config > 4)
         new_che_pos[ID_CPE][(channel_config == 7) + 1]
-                                = AAC_CHANNEL_BACK;  // back stereo
+                               = AAC_CHANNEL_BACK;  // back stereo
     if(channel_config > 5)
         new_che_pos[ID_LFE][0] = AAC_CHANNEL_LFE;   // LFE
     if(channel_config == 7)
@@ -309,7 +307,6 @@ static int set_pce_to_defaults(AACContex
     return 0;
 }
 
-
 /**
  * Decode GA "General Audio" specific configuration; reference: table 4.1.
  */
@@ -333,7 +330,7 @@ static int decode_ga_specific_config(AAC
     memset(new_che_pos, 0, 4 * MAX_TAGID * sizeof(new_che_pos[0][0]));
     if (channel_config == 0) {
         skip_bits(gb, 4);  // element_instance_tag
-        if((ret  = program_config_element(ac, new_che_pos, gb)))
+        if((ret = program_config_element(ac, new_che_pos, gb)))
             return ret;
     } else {
         if((ret = set_pce_to_defaults(ac, new_che_pos, channel_config)))
@@ -363,7 +360,6 @@ static int decode_ga_specific_config(AAC
     return 0;
 }
 
-
 /**
  * Decode audio specific configuration; reference: table 1.13.
  *
@@ -1418,7 +1414,6 @@ static int apply_ltp(AACContext * ac, Si
     return 0;
 }
 
-
 /**
  * @todo: Replace this with float_to_int16().
  */
@@ -1435,7 +1430,6 @@ static inline int16_t ltp_round(float x)
     return lrintf(32768 * x);
 }
 
-
 static int update_ltp(SingleChannelElement * sce, int is_saved) {
     int i;
     if (!sce->ltp_state && !(sce->ltp_state = av_mallocz(4 * 1024 * sizeof(int16_t))))
@@ -1794,12 +1788,11 @@ static int convert_to_int16(AVCodecConte
     }
     *data_size = i;
 
-        ac->dsp.float_to_int16_interleave(data, (const float **)ac->output_data, 1024, avccontext->channels);
+    ac->dsp.float_to_int16_interleave(data, (const float **)ac->output_data, 1024, avccontext->channels);
 
     return 0;
 }
 
-
 static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data_size, const uint8_t * buf, int buf_size) {
     AACContext * ac = avccontext->priv_data;
     GetBitContext gb;
@@ -1913,4 +1906,3 @@ AVCodec aac_decoder = {
     .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"),
     .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
 };
-