changeset 14909:aa6715eaa28c

Fix very old ra files with no fourcc
author rtognimp
date Thu, 03 Mar 2005 23:02:45 +0000
parents 82344f91104a
children 07be3bc42d47
files libmpdemux/demux_realaud.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_realaud.c	Thu Mar 03 21:13:30 2005 +0000
+++ b/libmpdemux/demux_realaud.c	Thu Mar 03 23:02:45 2005 +0000
@@ -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;