[Mplayer-cvslog] CVS: main/libmpdemux demuxer.h,1.63,1.64

[Moritz Bunkus CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv8668

Modified Files:
	demuxer.h 
Log Message:
Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico <nsabbi at libero.it>.

Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- demuxer.h	28 Aug 2003 13:31:44 -0000	1.63
+++ demuxer.h	29 Aug 2003 08:03:56 -0000	1.64
@@ -42,16 +42,20 @@
 #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