diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-02 22:14:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-02 22:15:39 +0100 |
| commit | 0935453e84a17035f0c3544913e7ab7775839176 (patch) | |
| tree | 0d29a32ca1fe449a5018cb465f4e880272c32715 /libavformat/mpegtsenc.c | |
| parent | 48e36f8a1276ef11274822dd99db0a0d6cbed87a (diff) | |
| download | ffmpeg-0935453e84a17035f0c3544913e7ab7775839176.tar.gz | |
avformat/mpegtsenc: Change the service_type field to enum
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegtsenc.c')
| -rw-r--r-- | libavformat/mpegtsenc.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 46ff522413..2a5624df9b 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -57,6 +57,17 @@ typedef struct MpegTSService { int pcr_packet_period; } MpegTSService; +/// service_type values as defined in ETSI 300 468 +enum ServiceType{ + MPEGTS_SERVICE_TYPE_DIGITAL_TV = 0x01, + MPEGTS_SERVICE_TYPE_DIGITAL_RADIO = 0x02, + MPEGTS_SERVICE_TYPE_TELETEXT = 0x03, + MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_RADIO = 0x0A, + MPEGTS_SERVICE_TYPE_MPEG2_DIGITAL_HDTV = 0x11, + MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_SDTV = 0x16, + MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_HDTV = 0x19 +}; + typedef struct MpegTSWrite { const AVClass *av_class; MpegTSSection pat; /* MPEG2 pat table */ @@ -76,17 +87,7 @@ typedef struct MpegTSWrite { int transport_stream_id; int original_network_id; int service_id; - int service_type; -// service_type values as defined in ETSI 300 468 - enum { - MPEGTS_SERVICE_TYPE_DIGITAL_TV = 0x01, - MPEGTS_SERVICE_TYPE_DIGITAL_RADIO = 0x02, - MPEGTS_SERVICE_TYPE_TELETEXT = 0x03, - MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_RADIO = 0x0A, - MPEGTS_SERVICE_TYPE_MPEG2_DIGITAL_HDTV = 0x11, - MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_SDTV = 0x16, - MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_HDTV = 0x19 - }; + enum ServiceType service_type; int pmt_start_pid; int start_pid; |