[MPlayer-users] Problems compiling on macbook

[Reimar Döffinger]

Hello,
On Sat, Nov 18, 2006 at 01:44:59PM -0500, Alexander Wehr wrote:
> Hi all, I recently aid hands on a 1.83 ghz core duo macbook, and in
> attempts to compile mplayer from the latest svn came out with some
> problems.
> 
> I configured with the --disable -win32 flag since the dll loader seems
> to be broken in darwin, but still got this error output:

Changelog says you also need --disable-mp3lib
But actually, could you please test attached patch for me?

Greetings,
Reimar Döffinger
-------------- next part --------------
diff --git a/mp3lib/dct64_sse.c b/mp3lib/dct64_sse.c
index 5fb8839..609d2e6 100644
--- a/mp3lib/dct64_sse.c
+++ b/mp3lib/dct64_sse.c
@@ -426,7 +426,7 @@ void dct64_sse(real *a,real *b,real *c)
         "fist  480(%4)\n\t"
         "fadds  92(%1)\n\t"
         "fistp 416(%4)\n\t"
-        "ffreep %%st(0)\n\t"
+        ".byte 0xdf, 0xc0\n\t" // ffreep %%st(0)
         :
         :"m"(costab_mmx[30]), "r"(b1), "r"(b2), "r"(a), "r"(b)
         :"memory"
diff --git a/mp3lib/decode_MMX.c b/mp3lib/decode_MMX.c
index 7fd9e47..47c1db8 100644
--- a/mp3lib/decode_MMX.c
+++ b/mp3lib/decode_MMX.c
@@ -91,7 +91,7 @@ __asm __volatile(
 	"pushl %%ecx\n\t"
 	"leal "MANGLE(mp3lib_decwins)"(%%ebx,%%ebx,1), %%edx\n\t"
 	"shrl $1, %%ecx\n\t"
-".balign 16\n\t"
+ASMALIGN(4)
 ".L03:\n\t"
         "movq  (%%edx),%%mm0\n\t"
         "movq  64(%%edx),%%mm4\n\t"
@@ -169,7 +169,7 @@ __asm __volatile(
 ".next_loop:\n\t"
         "subl $64,%%esi\n\t"
         "movl $7,%%ecx\n\t"
-".balign 16\n\t"
+ASMALIGN(4)
 ".L04:\n\t"
         "movq  (%%edx),%%mm0\n\t"
         "movq  64(%%edx),%%mm4\n\t"