From 01eb667a5516a72ede2ce83391bf3130a2509b90 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 1 Apr 2008 17:31:37 +0000 Subject: 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 --- libmpeg2/idct.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libmpeg2/idct.c') diff --git a/libmpeg2/idct.c b/libmpeg2/idct.c index deff620f92..5fb4b508af 100644 --- a/libmpeg2/idct.c +++ b/libmpeg2/idct.c @@ -239,21 +239,18 @@ static void mpeg2_idct_add_c (const int last, int16_t * block, void mpeg2_idct_init (uint32_t accel) { -#ifdef HAVE_MMX2 +#ifdef ARCH_X86 if (accel & MPEG2_ACCEL_X86_MMXEXT) { mpeg2_idct_copy = mpeg2_idct_copy_mmxext; mpeg2_idct_add = mpeg2_idct_add_mmxext; mpeg2_idct_mmx_init (); - } else -#endif -#ifdef HAVE_MMX - if (accel & MPEG2_ACCEL_X86_MMX) { + } else if (accel & MPEG2_ACCEL_X86_MMX) { mpeg2_idct_copy = mpeg2_idct_copy_mmx; mpeg2_idct_add = mpeg2_idct_add_mmx; mpeg2_idct_mmx_init (); } else #endif -#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC) +#ifdef ARCH_PPC if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { mpeg2_idct_copy = mpeg2_idct_copy_altivec; mpeg2_idct_add = mpeg2_idct_add_altivec; -- cgit v1.2.3