[MPlayer-cvslog] CVS: main/libmpdemux demux_audio.c,1.33,1.34

[Richard Felker CVS]

CVS change done by Richard Felker CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv16154/libmpdemux

Modified Files:
	demux_audio.c 
Log Message:
nico partially fixed the bug i reported; here's the rest of the fix.
basically demux_audio was mixing data in its header buffer in a bogus
manner, whereby it could sometimes "make up" valid mpeg headers where
no such header actually occurred in the file. it should be correct now.

btw these changes also fix the bug where mplayer reports huge initial
cpu usage for sound when playing mp3 files.


Index: demux_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_audio.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- demux_audio.c	17 Apr 2005 17:08:55 -0000	1.33
+++ demux_audio.c	17 Apr 2005 17:17:52 -0000	1.34
@@ -159,6 +159,7 @@
       break;      
     } else if((mp3_flen = mp_get_mp3_header(hdr,&mp3_chans,&mp3_freq,&mpa_spf,&mpa_layer)) > 0) {
       stream_skip(s, mp3_flen - HDR_SIZE);
+      step = HDR_SIZE;
       mp3_found = add_mp3_hdr(&mp3_hdrs, st_pos, mp3_chans, mp3_freq, mp3_flen);
       if (mp3_found) {
         frmt = MP3;