Commit c348a42d authored by Michael Niedermayer's avatar Michael Niedermayer

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

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

This reverts commit 0935453e.
parent 0935453e
...@@ -57,17 +57,6 @@ typedef struct MpegTSService { ...@@ -57,17 +57,6 @@ typedef struct MpegTSService {
int pcr_packet_period; int pcr_packet_period;
} MpegTSService; } 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 { typedef struct MpegTSWrite {
const AVClass *av_class; const AVClass *av_class;
MpegTSSection pat; /* MPEG2 pat table */ MpegTSSection pat; /* MPEG2 pat table */
...@@ -87,7 +76,17 @@ typedef struct MpegTSWrite { ...@@ -87,7 +76,17 @@ typedef struct MpegTSWrite {
int transport_stream_id; int transport_stream_id;
int original_network_id; int original_network_id;
int service_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 pmt_start_pid;
int start_pid; int start_pid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment