summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-03-16 20:13:28 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-03-16 20:13:28 +0000
commit5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6 (patch)
treed8d453ffd3502d82418494650e44a6dae9ff5359 /libmpdemux/demuxer.h
parent79102684ed09aef64829bb0ef67469dfccf5afe3 (diff)
downloadmpv-5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6.tar.bz2
mpv-5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6.tar.xz
this is a combo patch that:
1) adds an experimental TS demuxer to mplayer 2) adds an input (streaming) interface from DVB cards. It compiles and runs with the following versions of the drivers: dvb-kernel (HEAD) (with stock kernel 2.4.20) and 0.9.4 (with kernel 2.4.18) patch by Nico <nsabbi@libero.it> some cleanups, ts demuxer fixes by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9611 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 0b211f30d5..2138e68a8d 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -37,11 +37,12 @@
#define DEMUXER_TYPE_RAWVIDEO 26
#define DEMUXER_TYPE_MPEG4_ES 27
#define DEMUXER_TYPE_GIF 28
+#define DEMUXER_TYPE_MPEG_TS 29
// 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 28
+#define DEMUXER_TYPE_MAX 29
#define DEMUXER_TYPE_DEMUXERS (1<<16)
// A virtual demuxer type for the network code