summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
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/demuxer.h
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/demuxer.h')
-rw-r--r--libmpdemux/demuxer.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 6d20bd34a7..0bb93ca2f6 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -22,9 +22,10 @@
#define DEMUXER_TYPE_ROQ 15
#define DEMUXER_TYPE_MF 16
#define DEMUXER_TYPE_AUDIO 17
+#define DEMUXER_TYPE_OGG 18
// This should always match the higest demuxer type number.
// Unless you want to disallow users to force the demuxer to some types
-#define DEMUXER_TYPE_MAX 17
+#define DEMUXER_TYPE_MAX 18
#define DEMUXER_TYPE_DEMUXERS (1<<16)
// A virtual demuxer type for the network code
@@ -167,6 +168,8 @@ void ds_free_packs(demux_stream_t *ds);
int ds_get_packet(demux_stream_t *ds,unsigned char **start);
int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start);
+// This is defined here because demux_stream_t ins't defined in stream.h
+stream_t* new_ds_stream(demux_stream_t *ds);
static inline int avi_stream_id(unsigned int id){
unsigned char *p=(unsigned char *)&id;