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 /libavutil/float_dsp.c | |
| parent | 205b2d2a9822e163cb24a2531d4b50e82e64eae4 (diff) | |
| parent | 55aa03b9f8f11ebb7535424cc0e5635558590f49 (diff) | |
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 'libavutil/float_dsp.c')
| -rw-r--r-- | libavutil/float_dsp.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c index 05e5a5a9d4..119fa650a3 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -74,6 +74,14 @@ static void vector_fmul_window_c(float *dst, const float *src0, } } +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]; +} + void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact) { fdsp->vector_fmul = vector_fmul_c; @@ -81,6 +89,7 @@ void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact) fdsp->vector_fmul_scalar = vector_fmul_scalar_c; fdsp->vector_dmul_scalar = vector_dmul_scalar_c; fdsp->vector_fmul_window = vector_fmul_window_c; + fdsp->vector_fmul_add = vector_fmul_add_c; #if ARCH_ARM ff_float_dsp_init_arm(fdsp); |