aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMatt Oliver <protogonoi@gmail.com>2015-02-04 00:46:39 +1100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-03 15:15:50 +0100
commit22504396fe24673843f8d07e3df254b667f504ef (patch)
tree4b8e21a9a8b5f02b5a8d32aa5bfdbead90db2521 /libavformat
parent63186ac5f12e1782ffee25d982789e53ce3f692d (diff)
downloadffmpeg-22504396fe24673843f8d07e3df254b667f504ef.tar.gz
avformat/mpegtsenc: Fix build with msvc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpegtsenc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 46ff522413..8a7b29d45c 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -57,6 +57,16 @@ typedef struct MpegTSService {
int pcr_packet_period;
} MpegTSService;
+// 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
+};
typedef struct MpegTSWrite {
const AVClass *av_class;
MpegTSSection pat; /* MPEG2 pat table */
@@ -77,16 +87,6 @@ typedef struct MpegTSWrite {
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
- };
int pmt_start_pid;
int start_pid;