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/dcadsp.h | |
| 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/dcadsp.h')
| -rw-r--r-- | libavcodec/dcadsp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dcadsp.h b/libavcodec/dcadsp.h index 20d18940f8..c1dd3011c8 100644 --- a/libavcodec/dcadsp.h +++ b/libavcodec/dcadsp.h @@ -23,8 +23,7 @@ #include "synth_filter.h" typedef struct DCADSPContext { - void (*lfe_fir[2])(float *out, const float *in, const float *coefs, - float scale); + void (*lfe_fir[2])(float *out, const float *in, const float *coefs); void (*qmf_32_subbands)(float samples_in[32][8], int sb_act, SynthFilterContext *synth, FFTContext *imdct, float synth_buf_ptr[512], |