[Mplayer-cvslog] CVS: main stream.h,1.6,1.7

Arpi of Ize arpi at mplayer.dev.hu
Sun Aug 12 03:59:24 CEST 2001


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

Modified Files:
	stream.h 
Log Message:
return type of stream_seek changed void->int

Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/stream.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- stream.h	31 Jul 2001 23:18:16 -0000	1.6
+++ stream.h	12 Aug 2001 01:59:22 -0000	1.7
@@ -112,22 +112,22 @@
   return stream_seek_long(s,pos);
 }
 
-inline static void stream_skip(stream_t *s,int len){
+inline static int stream_skip(stream_t *s,int len){
   if(len<0 || (len>2*STREAM_BUFFER_SIZE && s->type!=STREAMTYPE_STREAM)){
     // negative or big skip!
-    stream_seek(s,stream_tell(s)+len);
-    return;
+    return stream_seek(s,stream_tell(s)+len);
   }
   while(len>0){
     int x=s->buf_len-s->buf_pos;
     if(x==0){
-      if(!stream_fill_buffer(s)) return; // EOF
+      if(!stream_fill_buffer(s)) return 0; // EOF
       x=s->buf_len-s->buf_pos;
     }
     if(x>len) x=len;
     //memcpy(mem,&s->buf[s->buf_pos],x);
     s->buf_pos+=x; len-=x;
   }
+  return 1;
 }
 
 void stream_reset(stream_t *s);




More information about the MPlayer-cvslog mailing list