summaryrefslogtreecommitdiffstats
path: root/mp3lib/sr1.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-06 01:06:21 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-06 01:06:21 +0000
commit0bdf67044ce904963374261c9426fe885aa34373 (patch)
treed2ce3617b46ed2cd955c1082a186a25b32e60b9d /mp3lib/sr1.c
parent834569d109748c88bb3c725056599733a760afa4 (diff)
downloadmpv-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/sr1.c')
-rw-r--r--mp3lib/sr1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index c7dc78d49d..760c680294 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -86,8 +86,8 @@ static int bitindex;
static unsigned char *wordpointer;
static int bitsleft;
-unsigned char *pcm_sample; /* outbuffer address */
-int pcm_point = 0; /* outbuffer offset */
+static unsigned char *pcm_sample; /* outbuffer address */
+static int pcm_point = 0; /* outbuffer offset */
static struct frame fr;
@@ -372,7 +372,7 @@ retry1:
return frames;
}
-int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs
+static int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs
#include "layer2.c"
#include "layer3.c"