diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:03:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-24 11:04:11 +0200 |
| commit | f9418d156fe641af50d05114a9787a3bdb579369 (patch) | |
| tree | 85db1ae696dfaba1b5603d412a57ac19d6391b37 /libavcodec/x86 | |
| parent | b99d3613cfdb5714a3c0e18b0db209280d879a10 (diff) | |
| parent | 8506ff97c9ea4a1f52983497ecf8d4ef193403a9 (diff) | |
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
vp56: Mark VP6-only optimizations as such.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 5 | ||||
| -rw-r--r-- | libavcodec/x86/vp6dsp.asm (renamed from libavcodec/x86/vp56dsp.asm) | 0 | ||||
| -rw-r--r-- | libavcodec/x86/vp6dsp_init.c (renamed from libavcodec/x86/vp56dsp_init.c) | 15 |
3 files changed, 8 insertions, 12 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index e881ef2a26..a8f4ae8b9d 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -29,8 +29,7 @@ OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_init.o OBJS-$(CONFIG_VIDEODSP) += x86/videodsp_init.o OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp_init.o OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o -OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o -OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o +OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp_init.o OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o @@ -98,6 +97,6 @@ YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp.o YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o YASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o -YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp.o +YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp.o YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o YASM-OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp.o diff --git a/libavcodec/x86/vp56dsp.asm b/libavcodec/x86/vp6dsp.asm index 3d874ea62a..3d874ea62a 100644 --- a/libavcodec/x86/vp56dsp.asm +++ b/libavcodec/x86/vp6dsp.asm diff --git a/libavcodec/x86/vp56dsp_init.c b/libavcodec/x86/vp6dsp_init.c index 09bdb1030d..8718e23a83 100644 --- a/libavcodec/x86/vp56dsp_init.c +++ b/libavcodec/x86/vp6dsp_init.c @@ -30,19 +30,16 @@ void ff_vp6_filter_diag4_mmx(uint8_t *dst, uint8_t *src, int stride, void ff_vp6_filter_diag4_sse2(uint8_t *dst, uint8_t *src, int stride, const int16_t *h_weights,const int16_t *v_weights); -av_cold void ff_vp56dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec) +av_cold void ff_vp6dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec) { int cpu_flags = av_get_cpu_flags(); - if (CONFIG_VP6_DECODER && codec == AV_CODEC_ID_VP6) { #if ARCH_X86_32 - if (EXTERNAL_MMX(cpu_flags)) { - c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx; - } + if (EXTERNAL_MMX(cpu_flags)) { + c->vp6_filter_diag4 = ff_vp6_filter_diag4_mmx; + } #endif - - if (EXTERNAL_SSE2(cpu_flags)) { - c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2; - } + if (EXTERNAL_SSE2(cpu_flags)) { + c->vp6_filter_diag4 = ff_vp6_filter_diag4_sse2; } } |