[Mplayer-cvslog] CVS: main/libmpdemux demux_avi.c,1.34,1.35

[Arpi of Ize]

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

Modified Files:
	demux_avi.c 
Log Message:
while_encoding.avi (ffmpeg) fix (ignoring movi_ check if end<=start)

Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- demux_avi.c	24 Oct 2001 00:25:52 -0000	1.34
+++ demux_avi.c	24 Oct 2001 00:50:54 -0000	1.35
@@ -192,7 +192,7 @@
     }
 
     pos=idx->dwChunkOffset+priv->idx_offset;
-    if(pos<demux->movi_start || pos>=demux->movi_end){
+    if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start)){
       mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range!   idx=0x%X  \n",pos);
       continue;
     }
@@ -224,7 +224,7 @@
     if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
   } else {
     demux->filepos=stream_tell(demux->stream);
-    if(demux->filepos>=demux->movi_end){
+    if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start){
           demux->stream->eof=1;
           return 0;
     }
@@ -284,7 +284,7 @@
     }
 
     pos=idx->dwChunkOffset+priv->idx_offset;
-    if(pos<demux->movi_start || pos>=demux->movi_end){
+    if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start)){
       mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range!  current=0x%X  idx=0x%X  \n",demux->filepos,pos);
       continue;
     }
@@ -347,7 +347,7 @@
 do{
 
   demux->filepos=stream_tell(demux->stream);
-  if(demux->filepos>=demux->movi_end){
+  if(demux->filepos>=demux->movi_end && (demux->movi_end>demux->movi_start)){
           demux->stream->eof=1;
           return 0;
   }