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_float.c | |
| parent | a12f679a5db9a2069f58a993317720c5b4f82c27 (diff) | |
| parent | 4958f35a2ebc307049ff2104ffb944f5f457feb3 (diff) | |
| download | ffmpeg-streaming-8e70fdab3614a5ef709d60b67c6729c3eca93c21.zip ffmpeg-streaming-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_float.c')
| -rw-r--r-- | libavcodec/ac3enc_float.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 532c56c..35fb418 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -88,18 +88,6 @@ av_cold int ff_ac3_float_mdct_init(AC3EncodeContext *s) /* - * Apply KBD window to input samples prior to MDCT. - */ -static void apply_window(void *dsp, float *output, - const float *input, const float *window, - unsigned int len) -{ - AVFloatDSPContext *fdsp = dsp; - fdsp->vector_fmul(output, input, window, len); -} - - -/* * Normalize the input samples. * Not needed for the floating-point encoder. */ |
