summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-02 18:02:05 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-02 18:02:05 +0200
commite62517ef6a8d23cd78325a9661f8865bd222e004 (patch)
tree76b7a0af867236c2989ceca1cffcae541ceda9c5 /libmpdemux/demuxer.h
parent62dda60800a902fdaf9b0ec63d8488aaa48c485f (diff)
parent27b167bb75b908541563bab964e97b06d621f837 (diff)
downloadmpv-e62517ef6a8d23cd78325a9661f8865bd222e004.tar.bz2
mpv-e62517ef6a8d23cd78325a9661f8865bd222e004.tar.xz
Merge svn changes up to r28065
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 3f2eb70585..993c30b904 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -66,11 +66,12 @@ struct MPOpts;
#define DEMUXER_TYPE_NUT 43
#define DEMUXER_TYPE_LAVF_PREFERRED 44
#define DEMUXER_TYPE_RTP_NEMESI 45
+#define DEMUXER_TYPE_MNG 46
// 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 45
+#define DEMUXER_TYPE_MAX 46
#define DEMUXER_TYPE_DEMUXERS (1<<16)
// A virtual demuxer type for the network code