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/motion_comp.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/motion_comp.c')
| -rw-r--r-- | libmpeg2/motion_comp.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c index 37c9c3db0e..0d26ba321f 100644 --- a/libmpeg2/motion_comp.c +++ b/libmpeg2/motion_comp.c @@ -37,12 +37,18 @@ mpeg2_mc_t mpeg2_mc; void mpeg2_mc_init (uint32_t accel) { -#ifdef ARCH_X86 +#ifdef HAVE_MMX2 if (accel & MPEG2_ACCEL_X86_MMXEXT) mpeg2_mc = mpeg2_mc_mmxext; - else if (accel & MPEG2_ACCEL_X86_3DNOW) + else +#endif +#ifdef HAVE_3DNOW + if (accel & MPEG2_ACCEL_X86_3DNOW) mpeg2_mc = mpeg2_mc_3dnow; - else if (accel & MPEG2_ACCEL_X86_MMX) + else +#endif +#ifdef HAVE_MMX + if (accel & MPEG2_ACCEL_X86_MMX) mpeg2_mc = mpeg2_mc_mmx; else #endif @@ -56,7 +62,7 @@ void mpeg2_mc_init (uint32_t accel) mpeg2_mc = mpeg2_mc_alpha; else #endif -#ifdef ARCH_SPARC +#ifdef HAVE_VIS if (accel & MPEG2_ACCEL_SPARC_VIS) mpeg2_mc = mpeg2_mc_vis; else |