Mercurial > mplayer.hg
comparison libmpdemux/demuxer.h @ 14034:7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
| author | nicodvb |
|---|---|
| date | Wed, 24 Nov 2004 18:55:03 +0000 |
| parents | 05f846322437 |
| children | 467dae0f6c68 |
comparison
equal
deleted
inserted
replaced
| 14033:96da209d49b0 | 14034:7ac60a1c576e |
|---|---|
| 53 | 53 |
| 54 #define DEMUXER_TYPE_DEMUXERS (1<<16) | 54 #define DEMUXER_TYPE_DEMUXERS (1<<16) |
| 55 // A virtual demuxer type for the network code | 55 // A virtual demuxer type for the network code |
| 56 #define DEMUXER_TYPE_PLAYLIST (2<<16) | 56 #define DEMUXER_TYPE_PLAYLIST (2<<16) |
| 57 | 57 |
| 58 //This one is needed only to identify mpeg4 in mpeg2-ts, shouldn't be used explicitly, | |
| 59 // rather use ths usual _TYPE_TS | |
| 60 #define DEMUXER_TYPE_MPEG4_IN_TS (3<<16) | |
| 61 | |
| 62 | 58 |
| 63 #define DEMUXER_TIME_NONE 0 | 59 #define DEMUXER_TIME_NONE 0 |
| 64 #define DEMUXER_TIME_PTS 1 | 60 #define DEMUXER_TIME_PTS 1 |
| 65 #define DEMUXER_TIME_FILE 2 | 61 #define DEMUXER_TIME_FILE 2 |
| 66 #define DEMUXER_TIME_BPS 3 | 62 #define DEMUXER_TIME_BPS 3 |