diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:18:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:18:57 +0100 |
| commit | 2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (patch) | |
| tree | ae0a70dc008a9dfccd0b313f6888665662c048a0 /libavcodec/x86/dsputil_mmx.c | |
| parent | 248140f8a2a6a00a668f59607791d24244a8ff50 (diff) | |
| parent | 8a4f26206d7914eaf2903954ce97cb7686933382 (diff) | |
| download | ffmpeg-2cf9ab655549cf2f25ba57ee84baa6d38530ec3b.tar.gz | |
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/x86/dsputil_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 57a5d2d060..1e0f8a168c 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -2041,11 +2041,6 @@ void ff_vector_clip_int32_int_sse2(int32_t *dst, const int32_t *src, void ff_vector_clip_int32_sse4 (int32_t *dst, const int32_t *src, int32_t min, int32_t max, unsigned int len); -extern void ff_butterflies_float_interleave_sse(float *dst, const float *src0, - const float *src1, int len); -extern void ff_butterflies_float_interleave_avx(float *dst, const float *src0, - const float *src1, int len); - #define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \ do { \ c->PFX ## _pixels_tab[IDX][ 0] = PREFIX ## PFX ## SIZE ## _mc00_ ## CPU; \ @@ -2306,7 +2301,6 @@ static void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags) c->vector_fmul_add = ff_vector_fmul_add_sse; c->scalarproduct_float = ff_scalarproduct_float_sse; - c->butterflies_float_interleave = ff_butterflies_float_interleave_sse; #if HAVE_INLINE_ASM && CONFIG_VIDEODSP c->gmc = gmc_sse; @@ -2461,7 +2455,6 @@ static void dsputil_init_avx(DSPContext *c, AVCodecContext *avctx, int mm_flags) c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx; } } - c->butterflies_float_interleave = ff_butterflies_float_interleave_avx; c->vector_fmul_reverse = ff_vector_fmul_reverse_avx; c->vector_fmul_add = ff_vector_fmul_add_avx; #endif /* HAVE_AVX_EXTERNAL */ |