From ee83fe5c8189f5d4fe2554e3967f0e261f5d0fad Mon Sep 17 00:00:00 2001 From: mosu Date: Fri, 29 Aug 2003 08:03:56 +0000 Subject: [PATCH] Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10716 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index ed22050576..5024443776 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -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