diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-06 01:06:21 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-06 01:06:21 +0000 |
commit | 0bdf67044ce904963374261c9426fe885aa34373 (patch) | |
tree | d2ce3617b46ed2cd955c1082a186a25b32e60b9d /mp3lib/tabinit.c | |
parent | 834569d109748c88bb3c725056599733a760afa4 (diff) | |
download | mpv-0bdf67044ce904963374261c9426fe885aa34373.tar.bz2 mpv-0bdf67044ce904963374261c9426fe885aa34373.tar.xz |
fix symbol clashes when linking with libmp3lame including mp3 decoder, man, mp3lib is so much bloated
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12132 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib/tabinit.c')
-rw-r--r-- | mp3lib/tabinit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mp3lib/tabinit.c b/mp3lib/tabinit.c index fd17bd95e6..cf5c0e2ee0 100644 --- a/mp3lib/tabinit.c +++ b/mp3lib/tabinit.c @@ -1,5 +1,5 @@ real mp3lib_decwin[(512+32)], cos64[32], cos32[16], cos16[8], cos8[4], cos4[2]; -real *pnts[]={ cos64,cos32,cos16,cos8,cos4 }; +real *mp3lib_pnts[]={ cos64,cos32,cos16,cos8,cos4 }; static long intwinbase[] = { 0, -1, -1, -1, -1, -1, -1, -2, -2, -2, @@ -29,7 +29,7 @@ static long intwinbase[] = { 64019, 65290, 66494, 67629, 68692, 69679, 70590, 71420, 72169, 72835, 73415, 73908, 74313, 74630, 74856, 74992, 75038 }; -void make_decode_tables(long scaleval) +static void make_decode_tables(long scaleval) { int i,j,k,kr,divv; real *table,*costab; @@ -38,7 +38,7 @@ void make_decode_tables(long scaleval) for(i=0;i<5;i++) { kr=0x10>>i; divv=0x40>>i; - costab = pnts[i]; + costab = mp3lib_pnts[i]; for(k=0;k<kr;k++) costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv)); } |