diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:04:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:04:50 +0100 |
| commit | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (patch) | |
| tree | 5e04d38f8e152faf98921843ca5e4530cbdc46a4 /libavcodec/x86/dsputil_mmx.c | |
| parent | b1b870fbd7185bffbe27c5918001b40a8ff8b920 (diff) | |
| parent | 42d324694883cdf1fff1612ac70fa403692a1ad4 (diff) | |
| download | ffmpeg-6e6e1708984e45881b9a5d4e26c3e7de852c54d5.tar.gz | |
Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'
* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
Conflicts:
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_vfp.S
libavcodec/dsputil.c
libavcodec/ppc/float_altivec.c
libavcodec/x86/dsputil.asm
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 79341c7dcb..c6d9939d8a 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1989,11 +1989,6 @@ int ff_add_hfyu_left_prediction_sse4(uint8_t *dst, const uint8_t *src, float ff_scalarproduct_float_sse(const float *v1, const float *v2, int order); -void ff_vector_fmul_reverse_sse(float *dst, const float *src0, - const float *src1, int len); -void ff_vector_fmul_reverse_avx(float *dst, const float *src0, - const float *src1, int len); - void ff_vector_clip_int32_mmx (int32_t *dst, const int32_t *src, int32_t min, int32_t max, unsigned int len); void ff_vector_clip_int32_sse2 (int32_t *dst, const int32_t *src, @@ -2257,8 +2252,6 @@ static void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags) #endif /* HAVE_INLINE_ASM */ #if HAVE_YASM - c->vector_fmul_reverse = ff_vector_fmul_reverse_sse; - c->scalarproduct_float = ff_scalarproduct_float_sse; #if HAVE_INLINE_ASM && CONFIG_VIDEODSP @@ -2414,7 +2407,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->vector_fmul_reverse = ff_vector_fmul_reverse_avx; #endif /* HAVE_AVX_EXTERNAL */ } |