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/arm/dsputil_init_neon.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/arm/dsputil_init_neon.c')
-rw-r--r-- | libavcodec/arm/dsputil_init_neon.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index 6d19af7981..c1f250acb6 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -45,9 +45,6 @@ int32_t ff_scalarproduct_int16_neon(const int16_t *v1, const int16_t *v2, int le int32_t ff_scalarproduct_and_madd_int16_neon(int16_t *v1, const int16_t *v2, const int16_t *v3, int len, int mul); -void ff_apply_window_int16_neon(int16_t *dst, const int16_t *src, - const int16_t *window, unsigned n); - av_cold void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) { const int high_bit_depth = avctx->bits_per_raw_sample > 8; @@ -76,6 +73,4 @@ av_cold void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) c->scalarproduct_int16 = ff_scalarproduct_int16_neon; c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_neon; - - c->apply_window_int16 = ff_apply_window_int16_neon; } |