[Mplayer-cvslog] CVS: main/libmpdemux demux_audio.c,1.13,1.14

[Richard Felker CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv8515/libmpdemux

Modified Files:
	demux_audio.c 
Log Message:
skip id3v2 junk when looking for mp3


Index: demux_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_audio.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- demux_audio.c	5 Nov 2002 01:21:35 -0000	1.13
+++ demux_audio.c	5 Nov 2002 23:28:52 -0000	1.14
@@ -65,6 +65,13 @@
       // We found wav header. Now we can have 'fmt ' or a mp3 header
       // empty the buffer
 	step = 4;
+    } else if( hdr[0] == 'I' && hdr[1] == 'D' && hdr[2] == '3' && (hdr[3] >= 2)) {
+      int len;
+      stream_skip(s,2);
+      stream_read(s,hdr,4);
+      len = (hdr[0]<<21) | (hdr[1]<<14) | (hdr[2]<<7) | hdr[3];
+      stream_skip(s,len);
+      step = 4;
     } else if( hdr[0] == 'f' && hdr[1] == 'm' && hdr[2] == 't' && hdr[3] == ' ' ) {
       frmt = WAV;
       break;