[Mplayer-cvslog] CVS: main/mp3lib decod386.c,1.13,1.14 decode_MMX.c,1.5,1.6 decode_i586.c,1.3,1.4 mpg123.h,1.5,1.6 tabinit.c,1.3,1.4 tabinit_MMX.c,1.4,1.5

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/mp3lib
In directory mail:/var/tmp.root/cvs-serv29194

Modified Files:
	decod386.c decode_MMX.c decode_i586.c mpg123.h tabinit.c 
	tabinit_MMX.c 
Log Message:
fixing that f*cking linker 'bug' e.g. naming config with libmp3lame

Index: decod386.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decod386.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- decod386.c	24 Dec 2002 00:05:43 -0000	1.13
+++ decod386.c	24 Dec 2002 22:33:46 -0000	1.14
@@ -202,7 +202,7 @@
 
   {
     register int j;
-    real *window = decwin + 16 - bo1;
+    real *window = mp3lib_decwin + 16 - bo1;
 
     for (j=16;j;j--,b0+=0x10,window+=0x20,samples+=step)
     {

Index: decode_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- decode_MMX.c	23 Mar 2002 21:44:05 -0000	1.5
+++ decode_MMX.c	24 Dec 2002 22:33:46 -0000	1.6
@@ -86,7 +86,7 @@
 	"leal 1(%%ebx), %%ecx\n\t"
         "subl %5,%%ebx\n\t"
 	"pushl %%ecx\n\t"
-	"leal "MANGLE(decwins)"(%%ebx,%%ebx,1), %%edx\n\t"
+	"leal "MANGLE(mp3lib_decwins)"(%%ebx,%%ebx,1), %%edx\n\t"
 	"shrl $1, %%ecx\n\t"
 ".balign 16\n\t"
 ".L03:\n\t"

Index: decode_i586.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_i586.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- decode_i586.c	24 Dec 2002 00:05:43 -0000	1.3
+++ decode_i586.c	24 Dec 2002 22:33:46 -0000	1.4
@@ -79,7 +79,7 @@
 "        addl $12,%%esp\n\t"
 "        movl %4,%%edx\n\t"
 "        leal 0(,%%edx,4),%%edx\n\t"
-"        movl $"MANGLE(decwin)"+64,%%eax\n\t"
+"        movl $"MANGLE(mp3lib_decwin)"+64,%%eax\n\t"
 "        movl %%eax,%%ecx\n\t"
 "        subl %%edx,%%ecx\n\t"
 "        movl $16,%%ebp\n\t"

Index: mpg123.h
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/mpg123.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mpg123.h	2 Jul 2001 19:31:45 -0000	1.5
+++ mpg123.h	24 Dec 2002 22:33:46 -0000	1.6
@@ -108,7 +108,7 @@
 };
 
 static long freqs[9];
-extern real decwin[(512+32)];
+extern real mp3lib_decwin[(512+32)];
 extern real *pnts[];
 
 static int do_layer2(struct frame *fr,int single);

Index: tabinit.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/tabinit.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tabinit.c	29 Jun 2001 17:53:53 -0000	1.3
+++ tabinit.c	24 Dec 2002 22:33:46 -0000	1.4
@@ -1,4 +1,4 @@
-real decwin[(512+32)], cos64[32], cos32[16], cos16[8], cos8[4], cos4[2];
+real mp3lib_decwin[(512+32)], cos64[32], cos32[16], cos16[8], cos8[4], cos4[2];
 real *pnts[]={ cos64,cos32,cos16,cos8,cos4 };
 
 static long intwinbase[] = {
@@ -42,11 +42,11 @@
     for(k=0;k<kr;k++) costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv));
   }
 
-  table = decwin;
+  table = mp3lib_decwin;
   scaleval = -scaleval;
   for(i=0,j=0;i<256;i++,j++,table+=32)
   {
-    if(table < decwin+512+16)
+    if(table < mp3lib_decwin+512+16)
       table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
     if(i % 32 == 31)
       table -= 1023;
@@ -56,7 +56,7 @@
 
   for( /* i=256 */ ;i<512;i++,j--,table+=32)
   {
-    if(table < decwin+512+16)
+    if(table < mp3lib_decwin+512+16)
       table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
     if(i % 32 == 31)
       table -= 1023;

Index: tabinit_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/tabinit_MMX.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tabinit_MMX.c	24 Dec 2002 00:06:33 -0000	1.4
+++ tabinit_MMX.c	24 Dec 2002 22:33:46 -0000	1.5
@@ -5,10 +5,10 @@
 */
 #include "../mangle.h"
 
-long __attribute__((aligned(8))) decwins [544];
+long __attribute__((aligned(8))) mp3lib_decwins [544];
 
 #define real float
-extern real decwin[(512+32)];
+extern real mp3lib_decwin[(512+32)];
 // static long decwin [544];
 
 static short intwinbase_MMX[] = 
@@ -95,7 +95,7 @@
 	"negl %3\n\t"
 	"jmp .L00\n\t"
 ".L04:\n\t"
-	::"g"(intwinbase_MMX),"m"(decwin[0]),"m"(scaleval),"m"(intwinbase_step)
+	::"g"(intwinbase_MMX),"m"(mp3lib_decwin[0]),"m"(scaleval),"m"(intwinbase_step)
 	:"memory","%ebx","%esi","%edi");
 intwinbase_step=2;
   __asm __volatile(
@@ -154,6 +154,6 @@
 	"negl %3\n\t"
 	"jmp .L05\n\t"
 ".L13:\n\t"
-	::"g"(intwinbase_MMX),"m"(decwins[0]),"m"(scaleval),"m"(intwinbase_step)
+	::"g"(intwinbase_MMX),"m"(mp3lib_decwins[0]),"m"(scaleval),"m"(intwinbase_step)
 	:"memory","%ebx","%esi","%edi");
 }