[FFmpeg-cvslog] cosmetics: indentation and spacing

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Jan 27 14:21:26 2011 +0000| [79ce107847fa89c132a7e7a8732f4fecef414c30] | committer: Michael Niedermayer

cosmetics: indentation and spacing
(cherry picked from commit b5ec6383432c907bed175f20e39af1a99dc75cfb)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79ce107847fa89c132a7e7a8732f4fecef414c30
---

 libavcodec/aacdec.c        |    4 ++--
 libavcodec/ac3dec.c        |    4 ++--
 libavcodec/dca.c           |   13 ++++++-------
 libavcodec/nellymoserdec.c |    2 +-
 libavcodec/wmadec.c        |   14 +++++++-------
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index fddec17..2d5fb54 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -568,8 +568,8 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
     // -1024 - Compensate wrong IMDCT method.
     // 60    - Required to scale values to the correct range [-32768,32767]
     //         for float to int16 conversion. (1 << (60 / 4)) == 32768
-        ac->sf_scale  = 1. / -1024.;
-        ac->sf_offset = 60;
+    ac->sf_scale  = 1. / -1024.;
+    ac->sf_offset = 60;
 
     ff_aac_tableinit();
 
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 2f9bc26..ab73877 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -195,8 +195,8 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
     dsputil_init(&s->dsp, avctx);
     av_lfg_init(&s->dith_state, 0);
 
-    /* set bias values for float to int16 conversion */
-        s->mul_bias = 32767.0f;
+    /* set scale value for float to int16 conversion */
+    s->mul_bias = 32767.0f;
 
     /* allow downmixing to stereo or mono */
     if (avctx->channels > 0 && avctx->request_channels > 0 &&
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index aa71411..fc5c0b5 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1838,14 +1838,13 @@ static av_cold int dca_decode_init(AVCodecContext * avctx)
         s->samples_chanptr[i] = s->samples + i * 256;
     avctx->sample_fmt = AV_SAMPLE_FMT_S16;
 
-        s->scale_bias = 1.0;
-
-        /* allow downmixing to stereo */
-        if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
-                avctx->request_channels == 2) {
-            avctx->channels = avctx->request_channels;
-        }
+    s->scale_bias = 1.0;
 
+    /* allow downmixing to stereo */
+    if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
+        avctx->request_channels == 2) {
+        avctx->channels = avctx->request_channels;
+    }
 
     return 0;
 }
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index e70d062..8b13a5d 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -135,7 +135,7 @@ static av_cold int decode_init(AVCodecContext * avctx) {
 
     dsputil_init(&s->dsp, avctx);
 
-        s->scale_bias = 1.0/(1*8);
+    s->scale_bias = 1.0/(1*8);
 
     /* Generate overlap window */
     if (!ff_sine_128[127])
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 03d7bd1..d85d80d 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -789,13 +789,13 @@ static int wma_decode_frame(WMACodecContext *s, int16_t *samples)
     /* convert frame to integer */
     n = s->frame_len;
     incr = s->nb_channels;
-        for (ch = 0; ch < MAX_CHANNELS; ch++)
-            output[ch] = s->frame_out[ch];
-        s->dsp.float_to_int16_interleave(samples, output, n, incr);
-        for(ch = 0; ch < incr; ch++) {
-            /* prepare for next block */
-            memmove(&s->frame_out[ch][0], &s->frame_out[ch][n], n * sizeof(float));
-        }
+    for (ch = 0; ch < MAX_CHANNELS; ch++)
+        output[ch] = s->frame_out[ch];
+    s->dsp.float_to_int16_interleave(samples, output, n, incr);
+    for (ch = 0; ch < incr; ch++) {
+        /* prepare for next block */
+        memmove(&s->frame_out[ch][0], &s->frame_out[ch][n], n * sizeof(float));
+    }
 
 #ifdef TRACE
     dump_shorts(s, "samples", samples, n * s->nb_channels);