diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-01 17:31:37 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-01 17:31:37 +0000 |
| commit | 01eb667a5516a72ede2ce83391bf3130a2509b90 (patch) | |
| tree | 64bbb53850e4a560792739a2166f79923c754231 /libmpeg2/motion_comp.c | |
| parent | 99901138ab31b54c023dad77f1581e0321f4002f (diff) | |
| download | mpv-01eb667a5516a72ede2ce83391bf3130a2509b90.tar.bz2 mpv-01eb667a5516a72ede2ce83391bf3130a2509b90.tar.xz | |
Revert local changes that pointlessly add #ifdefs all over libmpeg2 to disable
code depending on CPU capabilities. Instead, rely on libmpeg2's builtin CPU
capability handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26314 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2/motion_comp.c')
| -rw-r--r-- | libmpeg2/motion_comp.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c index 3307c0af8d..7099b2d957 100644 --- a/libmpeg2/motion_comp.c +++ b/libmpeg2/motion_comp.c @@ -37,22 +37,16 @@ mpeg2_mc_t mpeg2_mc; void mpeg2_mc_init (uint32_t accel) { -#ifdef HAVE_MMX2 +#ifdef ARCH_X86 if (accel & MPEG2_ACCEL_X86_MMXEXT) mpeg2_mc = mpeg2_mc_mmxext; - else -#endif -#ifdef HAVE_3DNOW - if (accel & MPEG2_ACCEL_X86_3DNOW) + else if (accel & MPEG2_ACCEL_X86_3DNOW) mpeg2_mc = mpeg2_mc_3dnow; - else -#endif -#ifdef HAVE_MMX - if (accel & MPEG2_ACCEL_X86_MMX) + else if (accel & MPEG2_ACCEL_X86_MMX) mpeg2_mc = mpeg2_mc_mmx; else #endif -#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) +#ifdef ARCH_PPC if (accel & MPEG2_ACCEL_PPC_ALTIVEC) mpeg2_mc = mpeg2_mc_altivec; else @@ -62,20 +56,17 @@ void mpeg2_mc_init (uint32_t accel) mpeg2_mc = mpeg2_mc_alpha; else #endif -#if defined(ARCH_SPARC) && defined(HAVE_VIS) +#ifdef ARCH_SPARC if (accel & MPEG2_ACCEL_SPARC_VIS) mpeg2_mc = mpeg2_mc_vis; else #endif #ifdef ARCH_ARM - if (accel & MPEG2_ACCEL_ARM) { -#ifdef HAVE_IWMMXT - if (accel & MPEG2_ACCEL_ARM_IWMMXT) - mpeg2_mc = mpeg2_mc_iwmmxt; - else -#endif - mpeg2_mc = mpeg2_mc_arm; - } else + if (accel & MPEG2_ACCEL_ARM_IWMMXT) + mpeg2_mc = mpeg2_mc_iwmmxt; + else if (accel & MPEG2_ACCEL_ARM) + mpeg2_mc = mpeg2_mc_arm; + else #endif mpeg2_mc = mpeg2_mc_c; } |