Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'

* commit '87ec849fe9acba075c843e67bcd01f256f481a18':
  dcadec: remove scaling in lfe_interpolation_fir

Conflicts:
	libavcodec/dcadec.c
	libavcodec/dcadsp.c

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

1 files changed, 7 insertions, 9 deletions

diff --git a/libavcodec/dcadsp.c b/libavcodec/dcadsp.c
index 65df2798ed..3a925fb93e 100644
--- a/libavcodec/dcadsp.c
+++ b/libavcodec/dcadsp.c
@@ -34,7 +34,7 @@ static void int8x8_fmul_int32_c(float *dst, const int8_t *src, int scale)
 
 static inline void
 dca_lfe_fir(float *out, const float *in, const float *coefs,
-            int decifactor, float scale)
+            int decifactor)
 {
     float *out2 = out + 2*decifactor-1;
     const float *cf0 = coefs;
@@ -50,8 +50,8 @@ dca_lfe_fir(float *out, const float *in, const float *coefs,
             v1 += in[1+j-num_coeffs] * *cf0;
 
         }
-        *out++  = v0 * scale;
-        *out2-- = v1 * scale;
+        *out++  = v0;
+        *out2-- = v1;
     }
 }
 
@@ -83,16 +83,14 @@ static void dca_qmf_32_subbands(float samples_in[32][8], int sb_act,
     }
 }
 
-static void dca_lfe_fir0_c(float *out, const float *in, const float *coefs,
-                           float scale)
+static void dca_lfe_fir0_c(float *out, const float *in, const float *coefs)
 {
-    dca_lfe_fir(out, in, coefs, 32, scale);
+    dca_lfe_fir(out, in, coefs, 32);
 }
 
-static void dca_lfe_fir1_c(float *out, const float *in, const float *coefs,
-                           float scale)
+static void dca_lfe_fir1_c(float *out, const float *in, const float *coefs)
 {
-    dca_lfe_fir(out, in, coefs, 64, scale);
+    dca_lfe_fir(out, in, coefs, 64);
 }
 
 av_cold void ff_dcadsp_init(DCADSPContext *s)