X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmpegts.h;h=688734129feab67ebb18d5fb3c19449649d8731e;hb=39c6b3f54c6affb2db6bd021185b874dd05496d6;hp=ef0ede6890e8d9482e145d8c771be5dca923b427;hpb=3f8cd151a0ea8dfef6b4c1b4cdf05dcdb46de63b;p=ffmpeg diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index ef0ede6890e..688734129fe 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -1,6 +1,6 @@ /* * MPEG2 transport stream defines - * Copyright (c) 2003 Fabrice Bellard. + * Copyright (c) 2003 Fabrice Bellard * * This file is part of FFmpeg. * @@ -27,6 +27,8 @@ #define TS_FEC_PACKET_SIZE 204 #define TS_DVHS_PACKET_SIZE 192 #define TS_PACKET_SIZE 188 +#define TS_MAX_PACKET_SIZE 204 + #define NB_PID_MAX 8192 #define MAX_SECTION_SIZE 4096 @@ -39,9 +41,6 @@ #define PMT_TID 0x02 #define SDT_TID 0x42 -/* descriptor ids */ -#define DVB_SUBT_DESCID 0x59 - #define STREAM_TYPE_VIDEO_MPEG1 0x01 #define STREAM_TYPE_VIDEO_MPEG2 0x02 #define STREAM_TYPE_AUDIO_MPEG1 0x03 @@ -52,17 +51,9 @@ #define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_VC1 0xea +#define STREAM_TYPE_VIDEO_DIRAC 0xd1 #define STREAM_TYPE_AUDIO_AC3 0x81 #define STREAM_TYPE_AUDIO_DTS 0x8a -#define STREAM_TYPE_SUBTITLE_DVB 0x100 - -typedef struct MpegTSContext MpegTSContext; - -MpegTSContext *mpegts_parse_open(AVFormatContext *s); -int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, - const uint8_t *buf, int len); -void mpegts_parse_close(MpegTSContext *ts); - #endif /* AVFORMAT_MPEGTS_H */