[MPlayer-cvslog] r21385 - trunk/libvo/osd_template.c

[reimar]

Author: reimar
Date: Wed Nov 29 14:49:48 2006
New Revision: 21385

Modified:
   trunk/libvo/osd_template.c

Log:
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)


Modified: trunk/libvo/osd_template.c
==============================================================================
--- trunk/libvo/osd_template.c	(original)
+++ trunk/libvo/osd_template.c	Wed Nov 29 14:49:48 2006
@@ -204,7 +204,7 @@
     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 @@
 	    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 @@
 #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 @@
             }
         }
 #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