Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'

* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
  dca: K&R formatting cosmetics

Conflicts:
	libavcodec/dca_parser.c
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 15 insertions, 10 deletions

diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c
index 7d5044298a..b32d962c33 100644
--- a/libavcodec/dcadsp.c
+++ b/libavcodec/dcadsp.c
@@ -20,8 +20,10 @@
  */
 
 #include "config.h"
+
 #include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
+
 #include "dcadsp.h"
 
 static void decode_hf_c(float dst[DCA_SUBBANDS][8],
@@ -42,9 +44,8 @@ static void decode_hf_c(float dst[DCA_SUBBANDS][8],
     }
 }
 
-static inline void
-dca_lfe_fir(float *out, const float *in, const float *coefs,
-            int decifactor)
+static inline void dca_lfe_fir(float *out, const float *in, const float *coefs,
+                               int decifactor)
 {
     float *out2    = out + 2 * decifactor - 1;
     int num_coeffs = 256 / decifactor;
@@ -55,7 +56,7 @@ dca_lfe_fir(float *out, const float *in, const float *coefs,
         float v0 = 0.0;
         float v1 = 0.0;
         for (j = 0; j < num_coeffs; j++, coefs++) {
-            v0 += in[-j] * *coefs;
+            v0 += in[-j]                 * *coefs;
             v1 += in[j + 1 - num_coeffs] * *coefs;
         }
         *out++  = v0;
@@ -86,7 +87,8 @@ static void dca_qmf_32_subbands(float samples_in[32][8], int sb_act,
         }
 
         synth->synth_filter_float(imdct, synth_buf_ptr, synth_buf_offset,
-                                  synth_buf2, window, samples_out, raXin, scale);
+                                  synth_buf2, window, samples_out, raXin,
+                                  scale);
         samples_out += 32;
     }
 }
@@ -103,10 +105,13 @@ static void dca_lfe_fir1_c(float *out, const float *in, const float *coefs)
 
 av_cold void ff_dcadsp_init(DCADSPContext *s)
 {
-    s->lfe_fir[0] = dca_lfe_fir0_c;
-    s->lfe_fir[1] = dca_lfe_fir1_c;
+    s->lfe_fir[0]      = dca_lfe_fir0_c;
+    s->lfe_fir[1]      = dca_lfe_fir1_c;
     s->qmf_32_subbands = dca_qmf_32_subbands;
-    s->decode_hf = decode_hf_c;
-    if (ARCH_ARM) ff_dcadsp_init_arm(s);
-    if (ARCH_X86) ff_dcadsp_init_x86(s);
+    s->decode_hf       = decode_hf_c;
+
+    if (ARCH_ARM)
+        ff_dcadsp_init_arm(s);
+    if (ARCH_X86)
+        ff_dcadsp_init_x86(s);
 }