[FFmpeg-cvslog] avformat/mpegtsenc: Fix build with msvc
Matt Oliver
git at videolan.org
Tue Feb 3 15:33:50 CET 2015
ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Wed Feb 4 00:46:39 2015 +1100| [22504396fe24673843f8d07e3df254b667f504ef] | committer: Michael Niedermayer
avformat/mpegtsenc: Fix build with msvc
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22504396fe24673843f8d07e3df254b667f504ef
---
libavformat/mpegtsenc.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 46ff522..8a7b29d 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;
More information about the ffmpeg-cvslog
mailing list