# HG changeset patch
# User uau
# Date 1203112354 0
# Node ID ef4297ed0d12896337e6e8b6a07e8e58001479a5
# Parent  63531b22e351d17b57187fd192b838c18f9c934f
libvo: change asm syntax to use ASMALIGN and " # nop"

Change ".balign 16\n\t" to ASMALIGN(4) and "/nop" to " # nop". The new
version is what other code in MPlayer uses, and works with old
assembler versions like that used on OS X.

diff -r 63531b22e351 -r ef4297ed0d12 libvo/aclib_template.c
--- a/libvo/aclib_template.c	Fri Feb 15 21:21:10 2008 +0000
+++ b/libvo/aclib_template.c	Fri Feb 15 21:52:34 2008 +0000
@@ -109,7 +109,7 @@
 #elif defined ( HAVE_3DNOW )
 #define PREFETCH  "prefetch"
 #else
-#define PREFETCH "/nop"
+#define PREFETCH " # nop"
 #endif
 
 /* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */
@@ -258,7 +258,7 @@
 	if(i>=BLOCK_SIZE/64)
 		asm volatile(
 			"xor %%"REG_a", %%"REG_a"	\n\t"
-			".balign 16		\n\t"
+			ASMALIGN(4)
 			"1:			\n\t"
 				"movl (%0, %%"REG_a"), %%ebx 	\n\t"
 				"movl 32(%0, %%"REG_a"), %%ebx 	\n\t"
@@ -270,7 +270,7 @@
 
 			"xor %%"REG_a", %%"REG_a"	\n\t"
 
-				".balign 16		\n\t"
+				ASMALIGN(4)
 				"2:			\n\t"
 				"movq (%0, %%"REG_a"), %%mm0\n"
 				"movq 8(%0, %%"REG_a"), %%mm1\n"
diff -r 63531b22e351 -r ef4297ed0d12 libvo/osd_template.c
--- a/libvo/osd_template.c	Fri Feb 15 21:21:10 2008 +0000
+++ b/libvo/osd_template.c	Fri Feb 15 21:52:34 2008 +0000
@@ -16,8 +16,8 @@
 #define PREFETCHW "prefetcht0"
 #define PAVGB	  "pavgb"
 #else
-#define PREFETCH "/nop"
-#define PREFETCHW "/nop"
+#define PREFETCH " # nop"
+#define PREFETCHW " # nop"
 #endif
 
 #ifdef HAVE_3DNOW