aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux
diff options
context:
space:
mode:
authorGravatar nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-01 21:56:30 +0000
committerGravatar nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-01 21:56:30 +0000
commitfe7694f7a7957f448fcaf3610577d284f7b3d55d (patch)
tree0eb00e546066429bb85186aa81b7440e430ae1cf /libmpdemux
parent56dbc658e45c8b4f9d430321e8df25a4c7da7baa (diff)
stream_control() returns int, not void
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17713 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/stream.c2
-rw-r--r--libmpdemux/stream.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index 8b4b21fd14..1175b2e048 100644
--- a/libmpdemux/stream.c
+++ b/libmpdemux/stream.c
@@ -347,7 +347,7 @@ void stream_reset(stream_t *s){
//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);
}
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h
index 9d53667e8b..8ed624f7a2 100644
--- a/libmpdemux/stream.h
+++ b/libmpdemux/stream.h
@@ -251,6 +251,7 @@ inline static int stream_skip(stream_t *s,off_t len){
}
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);