diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-24 18:55:03 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-24 18:55:03 +0000 |
| commit | 939cfe134118da389a5050c89f5575935f94ae8f (patch) | |
| tree | b5335db368ebe36e049dfb3ecf84d544c2767ac3 /libmpdemux/demuxer.h | |
| parent | 8f722ca9d8e37cefb1e804aeb18b48da5880ef2f (diff) | |
| download | mpv-939cfe134118da389a5050c89f5575935f94ae8f.tar.bz2 mpv-939cfe134118da389a5050c89f5575935f94ae8f.tar.xz | |
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14035 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 2d665b8210..ef2d117f66 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -55,10 +55,6 @@ // 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 |