diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:31:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:31:55 +0100 |
| commit | 8102f27b5b3dff54f8099019c2df4701ac5e5d4f (patch) | |
| tree | f623e5063c24e6c4afc50338dfeecf7054c673a2 /libavcodec/dsputil.h | |
| parent | 24604ebaf85b5436d10da811f455dd710b353aca (diff) | |
| parent | 73b704ac609d83e0be124589f24efd9b94947cf9 (diff) | |
| download | ffmpeg-8102f27b5b3dff54f8099019c2df4701ac5e5d4f.tar.gz | |
Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'
* commit '73b704ac609d83e0be124589f24efd9b94947cf9':
arm: Add some missing header #includes
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/acelp_pitch_delay.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/ra288.c
libavcodec/x86/dsputil_mmx.c
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 8953d972bd..0b27ebd54b 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -360,13 +360,6 @@ typedef struct DSPContext { /* assume len is a multiple of 8, and arrays are 16-byte aligned */ void (*vector_clipf)(float *dst /* align 16 */, const float *src /* align 16 */, float min, float max, int len /* align 16 */); - /** - * Calculate the scalar product of two vectors of floats. - * @param v1 first vector, 16-byte aligned - * @param v2 second vector, 16-byte aligned - * @param len length of vectors, multiple of 4 - */ - float (*scalarproduct_float)(const float *v1, const float *v2, int len); /* (I)DCT */ void (*fdct)(DCTELEM *block/* align 16*/); @@ -474,17 +467,6 @@ attribute_deprecated void dsputil_init(DSPContext* c, AVCodecContext *avctx); int ff_check_alignment(void); /** - * Return the scalar product of two vectors. - * - * @param v1 first input vector - * @param v2 first input vector - * @param len number of elements - * - * @return sum of elementwise products - */ -float ff_scalarproduct_float_c(const float *v1, const float *v2, int len); - -/** * permute block according to permuatation. * @param last last non zero element in scantable order */ |