Mercurial > mplayer.hg
changeset 10715:6549152f1f11
Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico <nsabbi@libero.it>.
| author | mosu |
|---|---|
| date | Fri, 29 Aug 2003 08:03:56 +0000 |
| parents | 240e212130d3 |
| children | aaaf37fb73ff |
| files | libmpdemux/demuxer.h |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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