diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-09 10:56:51 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-09 10:56:51 +0000 |
| commit | d60e8b3d723ce50c8fa6789956f145f530d95703 (patch) | |
| tree | c98500926871258367659cd3bd83bd2504a93707 /libmpeg2/idct.c | |
| parent | 4c532c4eb718a92eb00aa22f780b6cb6e4d03a1d (diff) | |
| download | mpv-d60e8b3d723ce50c8fa6789956f145f530d95703.tar.bz2 mpv-d60e8b3d723ce50c8fa6789956f145f530d95703.tar.xz | |
Use preprocessor conditionals to disable CPU-extension-specific code. We cannot
rely on libmpeg2's internal CPU extension handling, it leads to link failures
with our build system. Fixes Bugzilla #1188.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27554 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2/idct.c')
| -rw-r--r-- | libmpeg2/idct.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libmpeg2/idct.c b/libmpeg2/idct.c index 80b84527da..7992fd5da4 100644 --- a/libmpeg2/idct.c +++ b/libmpeg2/idct.c @@ -239,16 +239,20 @@ static void mpeg2_idct_add_c (const int last, int16_t * block, void mpeg2_idct_init (uint32_t accel) { -#ifdef ARCH_X86 +#ifdef HAVE_SSE2 if (accel & MPEG2_ACCEL_X86_SSE2) { mpeg2_idct_copy = mpeg2_idct_copy_sse2; mpeg2_idct_add = mpeg2_idct_add_sse2; mpeg2_idct_mmx_init (); - } else if (accel & MPEG2_ACCEL_X86_MMXEXT) { + } else +#elif HAVE_MMX2 + 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 if (accel & MPEG2_ACCEL_X86_MMX) { + } else +#elif HAVE_MMX + if (accel & MPEG2_ACCEL_X86_MMX) { mpeg2_idct_copy = mpeg2_idct_copy_mmx; mpeg2_idct_add = mpeg2_idct_add_mmx; mpeg2_idct_mmx_init (); @@ -261,12 +265,14 @@ void mpeg2_idct_init (uint32_t accel) mpeg2_idct_altivec_init (); } else #endif -#ifdef ARCH_ALPHA +#ifdef HAVE_VIS if (accel & MPEG2_ACCEL_ALPHA_MVI) { mpeg2_idct_copy = mpeg2_idct_copy_mvi; mpeg2_idct_add = mpeg2_idct_add_mvi; mpeg2_idct_alpha_init (); - } else if (accel & MPEG2_ACCEL_ALPHA) { + } else +#elif ARCH_ALPHA + if (accel & MPEG2_ACCEL_ALPHA) { int i; mpeg2_idct_copy = mpeg2_idct_copy_alpha; |