diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-10-06 20:28:56 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-08-23 14:42:19 +0200 |
| commit | 8506ff97c9ea4a1f52983497ecf8d4ef193403a9 (patch) | |
| tree | c02b5b1de9259e6f05b0ba373565c12206335109 /libavcodec/x86 | |
| parent | 30ce289074e88f528965cb57720674a675639737 (diff) | |
| download | ffmpeg-8506ff97c9ea4a1f52983497ecf8d4ef193403a9.tar.gz | |
vp56: Mark VP6-only optimizations as such.
Most of our VP56 optimizations are VP6-only and will stay that way.
So avoid compiling them for VP5-only builds.
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 e3b533d2d1..9a0c0971c6 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -27,8 +27,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_XMM_CLOBBER_TEST) += x86/w64xmmtest.o @@ -88,5 +87,5 @@ 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 diff --git a/libavcodec/x86/vp56dsp.asm b/libavcodec/x86/vp6dsp.asm index 80f8ca5f38..80f8ca5f38 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 1596273fdd..c4a500b28a 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; } } |