[MPlayer-cvslog] CVS: main/libmpdemux demux_realaud.c,1.6,1.7

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

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

Modified Files:
	demux_realaud.c 
Log Message:
Fix very old ra files with no fourcc


Index: demux_realaud.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_realaud.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demux_realaud.c	3 Mar 2005 21:13:30 -0000	1.6
+++ demux_realaud.c	3 Mar 2005 23:02:45 -0000	1.7
@@ -192,6 +192,7 @@
 	}
 
 	if (ra_priv->version == 3) {
+	    if(ra_priv->hdr_size + 8 > stream_tell(demuxer->stream)) {
 		stream_skip(demuxer->stream, 1);
 		i = stream_read_char(demuxer->stream);
 		sh->format = stream_read_dword_le(demuxer->stream);
@@ -200,12 +201,14 @@
 				"MPlayer developers\n", i);
 			stream_skip(demuxer->stream, i - 4);
 		}
-//		stream_skip(demuxer->stream, 3);
 
 		if (sh->format != FOURCC_LPCJ) {
 			mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] Version 3 with FourCC %8x, please report to "
 				"MPlayer developers\n", sh->format);
 		}
+	    } else
+		// If a stream does not have fourcc, let's assume it's 14.4
+		sh->format = FOURCC_LPCJ;
 
 		sh->channels = 1;
 		sh->samplesize = 16;