summaryrefslogtreecommitdiffstats
path: root/libmpeg2
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-19 05:47:21 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-19 05:47:21 +0000
commit916c35ec6b4d4ac0dafc8e01dcb495cff8731672 (patch)
treea0962f53321a825143d78f522121b9f3817ab1ef /libmpeg2
parent408cc87d58b5ccebc82c20692fd1ee1dbf46a562 (diff)
downloadmpv-916c35ec6b4d4ac0dafc8e01dcb495cff8731672.tar.bz2
mpv-916c35ec6b4d4ac0dafc8e01dcb495cff8731672.tar.xz
10l, i broke this with my last commit. should be fixed now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19139 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
-rw-r--r--libmpeg2/idct.c7
-rw-r--r--libmpeg2/motion_comp.c12
2 files changed, 14 insertions, 5 deletions
diff --git a/libmpeg2/idct.c b/libmpeg2/idct.c
index 75b07c8915..46ecec8a68 100644
--- a/libmpeg2/idct.c
+++ b/libmpeg2/idct.c
@@ -239,12 +239,15 @@ static void mpeg2_idct_add_c (const int last, int16_t * block,
void mpeg2_idct_init (uint32_t accel)
{
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#ifdef 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
+#endif
+#ifdef 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 ();
diff --git a/libmpeg2/motion_comp.c b/libmpeg2/motion_comp.c
index 3cbca6fefe..b6cc4bfcb9 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)
{
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
+#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