diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 04:12:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 04:12:40 +0100 |
| commit | 8e70fdab3614a5ef709d60b67c6729c3eca93c21 (patch) | |
| tree | e18aa3e652eb2ec4949bd4186e49aa385a0d39a8 /libavcodec/ac3enc_template.c | |
| parent | a12f679a5db9a2069f58a993317720c5b4f82c27 (diff) | |
| parent | 4958f35a2ebc307049ff2104ffb944f5f457feb3 (diff) | |
| download | ffmpeg-8e70fdab3614a5ef709d60b67c6729c3eca93c21.tar.gz | |
Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
dsputil: Move apply_window_int16 to ac3dsp
Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_template.c')
| -rw-r--r-- | libavcodec/ac3enc_template.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index 354be53c7f..4689f7020b 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -34,10 +34,6 @@ static void scale_coefficients(AC3EncodeContext *s); -static void apply_window(void *dsp, SampleType *output, - const SampleType *input, const SampleType *window, - unsigned int len); - static int normalize_samples(AC3EncodeContext *s); static void clip_coefficients(DSPContext *dsp, CoefType *coef, unsigned int len); @@ -105,11 +101,11 @@ static void apply_mdct(AC3EncodeContext *s) const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE]; #if CONFIG_AC3ENC_FLOAT - apply_window(&s->fdsp, s->windowed_samples, input_samples, - s->mdct_window, AC3_WINDOW_SIZE); + s->fdsp.vector_fmul(s->windowed_samples, input_samples, + s->mdct_window, AC3_WINDOW_SIZE); #else - apply_window(&s->dsp, s->windowed_samples, input_samples, - s->mdct_window, AC3_WINDOW_SIZE); + s->ac3dsp.apply_window_int16(s->windowed_samples, input_samples, + s->mdct_window, AC3_WINDOW_SIZE); #endif if (s->fixed_point) |