[MPlayer-cvslog] CVS: main/mp3lib sr1.c,1.34,1.35

[Guillaume Poirier CVS]

CVS change done by Guillaume Poirier CVS

Update of /cvsroot/mplayer/main/mp3lib
In directory mail:/var2/tmp/cvs-serv15927/mp3lib

Modified Files:
	sr1.c 
Log Message:
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)


Index: sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sr1.c	31 Dec 2005 18:56:35 -0000	1.34
+++ sr1.c	3 Jan 2006 22:06:12 -0000	1.35
@@ -45,7 +45,7 @@
 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 @@
 
     _has_mmx = 0;
     dct36_func = dct36;
-    MP3_resync = 1;
 
     make_decode_tables(outscale);