diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:59:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:59:15 +0200 |
| commit | 40f3a87c10d5773eb66e09f4ed3d8197b1840863 (patch) | |
| tree | bee50efb5beaff032de1fc4dcd797e3000b30c4c /libavcodec/arm/dsputil_init_neon.c | |
| parent | 5c6e94c42bcdc026071855a6b1749406b2456c8b (diff) | |
| parent | 054013a0fc6f2b52c60cee3e051be8cc7f82cef3 (diff) | |
| download | ffmpeg-40f3a87c10d5773eb66e09f4ed3d8197b1840863.tar.gz | |
Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'
* commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3':
dsputil: Move APE-specific bits into apedsp
Conflicts:
libavcodec/arm/int_neon.S
libavcodec/x86/dsputil.asm
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 8da442bf82..c7b393aa52 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -44,9 +44,6 @@ void ff_vector_clip_int32_neon(int32_t *dst, const int32_t *src, int32_t min, int32_t ff_scalarproduct_int16_neon(const int16_t *v1, const int16_t *v2, int len); -int32_t ff_scalarproduct_and_madd_int16_neon(int16_t *v1, const int16_t *v2, - const int16_t *v3, int len, int mul); - av_cold void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) { @@ -73,6 +70,4 @@ av_cold void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx, c->vector_clip_int32 = ff_vector_clip_int32_neon; c->scalarproduct_int16 = ff_scalarproduct_int16_neon; - - c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_neon; } |