diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 18:18:57 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 18:18:57 +0400 |
commit | 2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (patch) | |
tree | ae0a70dc008a9dfccd0b313f6888665662c048a0 /libavcodec/dsputil.c | |
parent | 248140f8a2a6a00a668f59607791d24244a8ff50 (diff) | |
parent | 8a4f26206d7914eaf2903954ce97cb7686933382 (diff) |
Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'
* commit '8a4f26206d7914eaf2903954ce97cb7686933382':
dsputil: remove butterflies_float_interleave.
srtp: Move a variable to a local scope
srtp: Add tests for the crypto suite with 32/80 bit HMAC
Conflicts:
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r-- | libavcodec/dsputil.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index db2f6f2358..6fa03fb3f9 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2507,18 +2507,6 @@ static void butterflies_float_c(float *av_restrict v1, float *av_restrict v2, } } -static void butterflies_float_interleave_c(float *dst, const float *src0, - const float *src1, int len) -{ - int i; - for (i = 0; i < len; i++) { - float f1 = src0[i]; - float f2 = src1[i]; - dst[2*i ] = f1 + f2; - dst[2*i + 1] = f1 - f2; - } -} - float ff_scalarproduct_float_c(const float *v1, const float *v2, int len) { float p = 0.0; @@ -3004,7 +2992,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->vector_clip_int32 = vector_clip_int32_c; c->scalarproduct_float = ff_scalarproduct_float_c; c->butterflies_float = butterflies_float_c; - c->butterflies_float_interleave = butterflies_float_interleave_c; c->shrink[0]= av_image_copy_plane; c->shrink[1]= ff_shrink22; |