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/dsputil.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/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 7b80a242a9..44dcf3f92d 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2186,19 +2186,6 @@ static int32_t scalarproduct_int16_c(const int16_t *v1, const int16_t *v2, return res; } -static int32_t scalarproduct_and_madd_int16_c(int16_t *v1, const int16_t *v2, - const int16_t *v3, - int order, int mul) -{ - int res = 0; - - while (order--) { - res += *v1 * *v2++; - *v1++ += mul * *v3++; - } - return res; -} - static void vector_clip_int32_c(int32_t *dst, const int32_t *src, int32_t min, int32_t max, unsigned int len) { @@ -2490,8 +2477,6 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx) c->try_8x8basis = try_8x8basis_c; c->add_8x8basis = add_8x8basis_c; - c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_c; - c->scalarproduct_int16 = scalarproduct_int16_c; c->vector_clip_int32 = vector_clip_int32_c; c->vector_clipf = vector_clipf_c; |