diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 13:54:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 13:54:34 +0100 |
commit | b1b870fbd7185bffbe27c5918001b40a8ff8b920 (patch) | |
tree | bcbe435fd95a2b06c8526617a2959fe0f6b8c637 /libavcodec/dsputil.c | |
parent | 205b2d2a9822e163cb24a2531d4b50e82e64eae4 (diff) | |
parent | 55aa03b9f8f11ebb7535424cc0e5635558590f49 (diff) | |
download | ffmpeg-streaming-b1b870fbd7185bffbe27c5918001b40a8ff8b920.zip ffmpeg-streaming-b1b870fbd7185bffbe27c5918001b40a8ff8b920.tar.gz |
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r-- | libavcodec/dsputil.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index c52c8f1..60e854f 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2490,12 +2490,6 @@ static void vector_fmul_reverse_c(float *dst, const float *src0, const float *sr dst[i] = src0[i] * src1[-i]; } -static void vector_fmul_add_c(float *dst, const float *src0, const float *src1, const float *src2, int len){ - int i; - for(i=0; i<len; i++) - dst[i] = src0[i] * src1[i] + src2[i]; -} - static void butterflies_float_c(float *av_restrict v1, float *av_restrict v2, int len) { @@ -2895,7 +2889,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->add_8x8basis= add_8x8basis_c; c->vector_fmul_reverse = vector_fmul_reverse_c; - c->vector_fmul_add = vector_fmul_add_c; c->vector_clipf = vector_clipf_c; c->scalarproduct_int16 = scalarproduct_int16_c; c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_c; |