diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 18:14:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 18:14:12 +0100 |
| commit | 90f674d55bd76e23a70ed68b8cb104b5d8b9505f (patch) | |
| tree | 97cdcf9e74c427c904dce33dd8fabc7b17a6bee7 /libavcodec/arm/dcadsp_init_arm.c | |
| parent | 810eb285e38dac89a0c04a87f1c8ce17a8bec770 (diff) | |
| parent | 87ec849fe9acba075c843e67bcd01f256f481a18 (diff) | |
| download | ffmpeg-90f674d55bd76e23a70ed68b8cb104b5d8b9505f.tar.gz | |
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>
Diffstat (limited to 'libavcodec/arm/dcadsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/dcadsp_init_arm.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/arm/dcadsp_init_arm.c b/libavcodec/arm/dcadsp_init_arm.c index 99e2df400c..d7dc654225 100644 --- a/libavcodec/arm/dcadsp_init_arm.c +++ b/libavcodec/arm/dcadsp_init_arm.c @@ -24,15 +24,11 @@ #include "libavutil/attributes.h" #include "libavcodec/dcadsp.h" -void ff_dca_lfe_fir0_neon(float *out, const float *in, const float *coefs, - float scale); -void ff_dca_lfe_fir1_neon(float *out, const float *in, const float *coefs, - float scale); +void ff_dca_lfe_fir0_neon(float *out, const float *in, const float *coefs); +void ff_dca_lfe_fir1_neon(float *out, const float *in, const float *coefs); -void ff_dca_lfe_fir32_vfp(float *out, const float *in, const float *coefs, - float scale); -void ff_dca_lfe_fir64_vfp(float *out, const float *in, const float *coefs, - float scale); +void ff_dca_lfe_fir32_vfp(float *out, const float *in, const float *coefs); +void ff_dca_lfe_fir64_vfp(float *out, const float *in, const float *coefs); void ff_dca_qmf_32_subbands_vfp(float samples_in[32][8], int sb_act, SynthFilterContext *synth, FFTContext *imdct, |