summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-06-09 00:24:49 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-06-09 00:24:49 +0000
commit080311d08f70042db8db88a6696a8a6c61c337df (patch)
tree82e106e42caafb41b5cfa63492b010be810e3b91 /libmpdemux/demuxer.h
parent14328b41fedf57134a759b5cd4e3d8af330e7e0f (diff)
downloadmpv-080311d08f70042db8db88a6696a8a6c61c337df.tar.bz2
mpv-080311d08f70042db8db88a6696a8a6c61c337df.tar.xz
TiVo demuxer and sub-cc/osd decoder
patch by usenet@wingert.org (http://tivo-mplayer.sourceforge.net/releases/MPlayer-20030501-tivo-patch.gz) changes by me: - spit demux_ty to demux_ty and demux_ty_osd (later handles mpeg user-data decoding, ie sub-cc and osd) - removed some cosmetics changes - some compile fixes (gcc3 specific variable decl etc) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10264 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.h')
-rw-r--r--libmpdemux/demuxer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 2e813be9db..35df464641 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -41,11 +41,12 @@
#define DEMUXER_TYPE_H264_ES 30
#define DEMUXER_TYPE_MATROSKA 31
#define DEMUXER_TYPE_REALAUDIO 32
+#define DEMUXER_TYPE_MPEG_TY 33
// 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_MIN 0
-#define DEMUXER_TYPE_MAX 32
+#define DEMUXER_TYPE_MAX 33
#define DEMUXER_TYPE_DEMUXERS (1<<16)
// A virtual demuxer type for the network code