[MPlayer-cvslog] CVS: main/libmpdemux stream.c, 1.85, 1.86 stream.h, 1.75, 1.76

Nico Sabbi CVS syncmail at mplayerhq.hu
Wed Mar 1 22:56:32 CET 2006


CVS change done by Nico Sabbi CVS

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

Modified Files:
	stream.c stream.h 
Log Message:
stream_control() returns int, not void

Index: stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- stream.c	27 Feb 2006 21:06:47 -0000	1.85
+++ stream.c	1 Mar 2006 21:56:30 -0000	1.86
@@ -347,7 +347,7 @@
   //stream_seek(s,0);
 }
 
-void stream_control(stream_t *s, int cmd, void *arg){
+int stream_control(stream_t *s, int cmd, void *arg){
   if(!s->control) return STREAM_UNSUPORTED;
   return s->control(s, cmd, arg);
 }

Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- stream.h	27 Feb 2006 21:08:58 -0000	1.75
+++ stream.h	1 Mar 2006 21:56:30 -0000	1.76
@@ -251,6 +251,7 @@
 }
 
 void stream_reset(stream_t *s);
+int stream_control(stream_t *s, int cmd, void *arg);
 stream_t* new_stream(int fd,int type);
 void free_stream(stream_t *s);
 stream_t* new_memory_stream(unsigned char* data,int len);




More information about the MPlayer-cvslog mailing list