summaryrefslogtreecommitdiffstats
path: root/libmpdemux/stream.c
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-16 14:32:03 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-03-16 14:32:03 +0000
commit14316b337915d8e933d07f3d70efe9df3ac64e0c (patch)
tree1865983926017da2f1c42fb95252316736c7e8b6 /libmpdemux/stream.c
parent7644b575f96e16e049c513d299d3fb5cd353b60b (diff)
downloadmpv-14316b337915d8e933d07f3d70efe9df3ac64e0c.tar.bz2
mpv-14316b337915d8e933d07f3d70efe9df3ac64e0c.tar.xz
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
with ogg/vorbis audio. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5134 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/stream.c')
-rw-r--r--libmpdemux/stream.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c
index 16b3998f38..7247f588e7 100644
--- a/libmpdemux/stream.c
+++ b/libmpdemux/stream.c
@@ -14,6 +14,7 @@
#include "help_mp.h"
#include "stream.h"
+#include "demuxer.h"
extern int verbose; // defined in mplayer.c
@@ -75,6 +76,9 @@ int stream_fill_buffer(stream_t *s){
break;
}
#endif
+ case STREAMTYPE_DS:
+ len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE);
+ break;
default: len=0;
}
if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
@@ -236,3 +240,8 @@ void free_stream(stream_t *s){
free(s);
}
+stream_t* new_ds_stream(demux_stream_t *ds) {
+ stream_t* s = new_stream(-1,STREAMTYPE_DS);
+ s->priv = ds;
+ return s;
+}