# HG changeset patch
# User mosu
# Date 1062144236 0
# Node ID 6549152f1f11ea014ab2acb9c2fe7ed4c2e39551
# Parent  240e212130d349731b1659efa9211d3a8e822aab
Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico <nsabbi@libero.it>.

diff -r 240e212130d3 -r 6549152f1f11 libmpdemux/demuxer.h
--- a/libmpdemux/demuxer.h	Thu Aug 28 22:11:42 2003 +0000
+++ b/libmpdemux/demuxer.h	Fri Aug 29 08:03:56 2003 +0000
@@ -42,17 +42,21 @@
 #define DEMUXER_TYPE_MATROSKA 31
 #define DEMUXER_TYPE_REALAUDIO 32
 #define DEMUXER_TYPE_MPEG_TY 33
-#define DEMUXER_TYPE_MPEG4_IN_TS 34
+
 
 // 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 34
+#define DEMUXER_TYPE_MAX 33
 
 #define DEMUXER_TYPE_DEMUXERS (1<<16)
 // A virtual demuxer type for the network code
 #define DEMUXER_TYPE_PLAYLIST (2<<16)
 
+//This one is needed only to identify mpeg4 in mpeg2-ts, shouldn't be used explicitly,
+// rather use ths usual _TYPE_TS
+#define DEMUXER_TYPE_MPEG4_IN_TS (3<<16)
+
 
 #define DEMUXER_TIME_NONE 0
 #define DEMUXER_TIME_PTS 1