[MPlayer-cvslog] CVS: main/libmpdemux demux_real.c,1.84,1.85

Reimar Döffinger CVS syncmail at mplayerhq.hu
Sat Jan 14 23:47:41 CET 2006


CVS change done by Reimar Döffinger CVS

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

Modified Files:
	demux_real.c 
Log Message:
Always try to parse index chunk, no reason to check for movi_end
Also check return value of parse_index_chunk


Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- demux_real.c	14 Jan 2006 19:24:55 -0000	1.84
+++ demux_real.c	14 Jan 2006 22:47:38 -0000	1.85
@@ -1748,16 +1748,14 @@
 
     switch (index_mode){
 	case -1: // untouched
-	    if (priv->index_chunk_offset && (priv->index_chunk_offset < demuxer->movi_end))
+	    if (priv->index_chunk_offset && parse_index_chunk(demuxer))
 	    {
-		parse_index_chunk(demuxer);
 		demuxer->seekable = 1;
 	    }
 	    break;
 	case 1: // use (generate index)
-	    if (priv->index_chunk_offset && (priv->index_chunk_offset < demuxer->movi_end))
+	    if (priv->index_chunk_offset && parse_index_chunk(demuxer))
 	    {
-		parse_index_chunk(demuxer);
 		demuxer->seekable = 1;
 	    } else {
 		generate_index(demuxer);




More information about the MPlayer-cvslog mailing list