MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "avformat/mpegtsenc: Change the service_type field to enum"

Browse Source 
This isnt safe due to AVOption accessing this field as int
i just realized a moment after pushing

This reverts commit 0935453e84.
This commit is contained in:
Michael Niedermayer 2015-02-02 22:30:56 +01:00
parent 0935453e84
commit c348a42dcc
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/mpegtsenc.c
View File

@ -57,17 +57,6 @@ 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 */
@ -87,7 +76,17 @@ typedef struct MpegTSWrite {
int transport_stream_id;
int original_network_id;
int service_id;
enum ServiceType service_type;
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
};
int pmt_start_pid;
int start_pid;