summaryrefslogtreecommitdiffstats
path: root/mp3lib
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-03 22:06:12 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-03 22:06:12 +0000
commit2c984298a5feba45410b9ed311a09582486dc643 (patch)
tree80b2a0ec1484ca12c4b8e279d6be4adb4c8d48cd /mp3lib
parent62bc91fba24e149b81f1c2b4b1dccc131a180a31 (diff)
downloadmpv-2c984298a5feba45410b9ed311a09582486dc643.tar.bz2
mpv-2c984298a5feba45410b9ed311a09582486dc643.tar.xz
Reverse commit 31 Dec 2005 18:56:35 -0000 1.34
This was an incorrect fix made at the codec when it should be done at the demuxer level. static variables in codecs are ALWAYS wrong: the demuxer is supposed to have already removed all the junk Does anyone have an idea of a fix for the demuxer? (discussed on IRC) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17301 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib')
-rw-r--r--mp3lib/sr1.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 952f2dcdc8..87ab7dc4b7 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -45,7 +45,7 @@ int MP3_fpos=0; // current file position
int MP3_framesize=0; // current framesize
int MP3_bitrate=0; // current bitrate
int MP3_samplerate=0; // current samplerate
-static int MP3_resync;
+int MP3_resync=0;
int MP3_channels=0;
int MP3_bps=2;
@@ -407,7 +407,6 @@ void MP3_Init(){
_has_mmx = 0;
dct36_func = dct36;
- MP3_resync = 1;
make_decode_tables(outscale);