From 4373e71a95dcaa2808af93c7130fb58f736d917c Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 29 Nov 2006 13:49:48 +0000
Subject: Avoid compiling code using %ah etc. on AMD64, since that will not
 work (problems only occur with -O0 or -Os, see also
 http://bugs.gentoo.org/show_bug.cgi?id=156375)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21385 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/osd_template.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libvo/osd_template.c b/libvo/osd_template.c
index 4a66aad509..2fabd207fa 100644
--- a/libvo/osd_template.c
+++ b/libvo/osd_template.c
@@ -204,7 +204,7 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src,
     for(y=0;y<h;y++){
         register unsigned char *dst = dstbase;
         register int x;
-#ifdef ARCH_X86
+#if defined(ARCH_X86) && (!defined(ARCH_X86_64) || defined(HAVE_MMX))
 #ifdef HAVE_MMX
     asm volatile(
 	PREFETCHW" %0\n\t"
@@ -277,7 +277,7 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src,
 	    dst += 3;
         }
 #endif /* !HAVE_MMX */
-#else /*non x86 arch*/
+#else /*non x86 arch or x86_64 with MMX disabled */
         for(x=0;x<w;x++){
             if(srca[x]){
 #ifdef FAST_OSD
@@ -324,7 +324,7 @@ static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src,
 #endif /* HAVE_MMX */
     for(y=0;y<h;y++){
         register int x;
-#ifdef ARCH_X86
+#if defined(ARCH_X86) && (!defined(ARCH_X86_64) || defined(HAVE_MMX))
 #ifdef HAVE_MMX
 #ifdef HAVE_3DNOW
     asm volatile(
@@ -443,7 +443,7 @@ static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src,
             }
         }
 #endif /* HAVE_MMX */
-#else /*non x86 arch*/
+#else /*non x86 arch or x86_64 with MMX disabled */
         for(x=0;x<w;x++){
             if(srca[x]){
 #ifdef FAST_OSD
-- 
cgit v1.2.3