diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-07-26 22:16:37 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-07-27 20:12:30 -0700 |
| commit | 4d777eedfd339e431d73a3787cc9587775f1ba9c (patch) | |
| tree | 9d73fc24789db4a053d85ae5e6a70bd36f54fb4e | |
| parent | a5bbb1242c494fad504f2b6ab2816f0268adb03a (diff) | |
vp3: don't compile mmx IDCT functions on x86-64.
64-bit CPUs always have SSE2, and a SSE2 version exists, thus the MMX
version will never be used.
| -rw-r--r-- | libavcodec/x86/vp3dsp.asm | 3 | ||||
| -rw-r--r-- | libavcodec/x86/vp3dsp_init.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/x86/vp3dsp.asm b/libavcodec/x86/vp3dsp.asm index 5877520c6c..7a88892c11 100644 --- a/libavcodec/x86/vp3dsp.asm +++ b/libavcodec/x86/vp3dsp.asm @@ -607,8 +607,11 @@ cglobal vp3_idct_add, 3, 4, 9 RET %endmacro +%if ARCH_X86_32 INIT_MMX mmx vp3_idct_funcs +%endif + INIT_XMM sse2 vp3_idct_funcs diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c index cd8e206a2c..704d4a6927 100644 --- a/libavcodec/x86/vp3dsp_init.c +++ b/libavcodec/x86/vp3dsp_init.c @@ -41,11 +41,13 @@ av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags) #if HAVE_YASM int cpuflags = av_get_cpu_flags(); +#if ARCH_X86_32 if (HAVE_MMX && cpuflags & AV_CPU_FLAG_MMX) { c->idct_put = ff_vp3_idct_put_mmx; c->idct_add = ff_vp3_idct_add_mmx; c->idct_perm = FF_PARTTRANS_IDCT_PERM; } +#endif if (HAVE_MMX2 && cpuflags & AV_CPU_FLAG_MMX2) { c->idct_dc_add = ff_vp3_idct_dc_add_mmx2; |