RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fixing that f*cking linker 'bug' e.g. naming config with libmp3lame 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8561 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2002-12-24 22:33:46 +00:00
parent fb8e7eff8d
commit 593a458f0c
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mp3lib/decod386.c
View File

@ -202,7 +202,7 @@ static int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
{ {
register int j; 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) for (j=16;j;j--,b0+=0x10,window+=0x20,samples+=step)
{ {

2
mp3lib/decode_MMX.c
View File

@ -86,7 +86,7 @@ __asm __volatile(
"leal 1(%%ebx), %%ecx\n\t" "leal 1(%%ebx), %%ecx\n\t"
"subl %5,%%ebx\n\t" "subl %5,%%ebx\n\t"
"pushl %%ecx\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" "shrl $1, %%ecx\n\t"
".balign 16\n\t" ".balign 16\n\t"
".L03:\n\t" ".L03:\n\t"

2
mp3lib/decode_i586.c
View File

@ -79,7 +79,7 @@ int synth_1to1_pent(real *bandPtr, int channel, short *samples)
" addl $12,%%esp\n\t" " addl $12,%%esp\n\t"
" movl %4,%%edx\n\t" " movl %4,%%edx\n\t"
" leal 0(,%%edx,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" " movl %%eax,%%ecx\n\t"
" subl %%edx,%%ecx\n\t" " subl %%edx,%%ecx\n\t"
" movl $16,%%ebp\n\t" " movl $16,%%ebp\n\t"

2
mp3lib/mpg123.h
View File

@ -108,7 +108,7 @@ struct III_sideinfo
}; };
static long freqs[9]; static long freqs[9];
extern real decwin[(512+32)]; extern real mp3lib_decwin[(512+32)];
extern real *pnts[]; extern real *pnts[];
static int do_layer2(struct frame *fr,int single); static int do_layer2(struct frame *fr,int single);

8
mp3lib/tabinit.c
View File

@ -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 }; real *pnts[]={ cos64,cos32,cos16,cos8,cos4 };
static long intwinbase[] = { static long intwinbase[] = {
@ -42,11 +42,11 @@ void make_decode_tables(long scaleval)
for(k=0;k<kr;k++) costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv)); 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; scaleval = -scaleval;
for(i=0,j=0;i<256;i++,j++,table+=32) 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; table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
if(i % 32 == 31) if(i % 32 == 31)
table -= 1023; table -= 1023;
@ -56,7 +56,7 @@ void make_decode_tables(long scaleval)
for( /* i=256 */ ;i<512;i++,j--,table+=32) 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; table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval;
if(i % 32 == 31) if(i % 32 == 31)
table -= 1023; table -= 1023;

8
mp3lib/tabinit_MMX.c
View File

@ -5,10 +5,10 @@
*/ */
#include "../mangle.h" #include "../mangle.h"
long __attribute__((aligned(8))) decwins [544]; long __attribute__((aligned(8))) mp3lib_decwins [544];
#define real float #define real float
extern real decwin[(512+32)]; extern real mp3lib_decwin[(512+32)];
// static long decwin [544]; // static long decwin [544];
static short intwinbase_MMX[] = static short intwinbase_MMX[] =
@ -95,7 +95,7 @@ void make_decode_tables_MMX(long scaleval)
"negl %3\n\t" "negl %3\n\t"
"jmp .L00\n\t" "jmp .L00\n\t"
".L04:\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"); :"memory","%ebx","%esi","%edi");
intwinbase_step=2; intwinbase_step=2;
__asm __volatile( __asm __volatile(
@ -154,6 +154,6 @@ intwinbase_step=2;
"negl %3\n\t" "negl %3\n\t"
"jmp .L05\n\t" "jmp .L05\n\t"
".L13:\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"); :"memory","%ebx","%esi","%edi");
} }