ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Sep 3 12:52:34 2014 +0200| [e489e8346672cb8d4312d3458208ae626c5507b2] | committer: Michael Niedermayer
avformat/mpegts: Change order of structs to match 7968059e5c3cd8f91407f379c11bbf71a1b84c74 Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e489e8346672cb8d4312d3458208ae626c5507b2 --- libavformat/mpegts.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 3c3926e..20a2d30 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -158,25 +158,6 @@ struct MpegTSContext { #define MPEGTS_OPTIONS \ { "resync_size", "Size limit for looking up a new syncronization.", offsetof(MpegTSContext, resync_size), AV_OPT_TYPE_INT, { .i64 = MAX_RESYNC_SIZE}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM } -static const AVOption raw_options[] = { - MPEGTS_OPTIONS, - { "compute_pcr", "Compute exact PCR for each transport stream packet.", - offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT, - { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, - { "ts_packetsize", "Output option carrying the raw packet size.", - offsetof(MpegTSContext, raw_packet_size), AV_OPT_TYPE_INT, - { .i64 = 0 }, 0, 0, - AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, - { NULL }, -}; - -static const AVClass mpegtsraw_class = { - .class_name = "mpegtsraw demuxer", - .item_name = av_default_item_name, - .option = raw_options, - .version = LIBAVUTIL_VERSION_INT, -}; - static const AVOption options[] = { MPEGTS_OPTIONS, {"fix_teletext_pts", "Try to fix pts values of dvb teletext streams.", offsetof(MpegTSContext, fix_teletext_pts), AV_OPT_TYPE_INT, @@ -197,6 +178,25 @@ static const AVClass mpegts_class = { .version = LIBAVUTIL_VERSION_INT, }; +static const AVOption raw_options[] = { + MPEGTS_OPTIONS, + { "compute_pcr", "Compute exact PCR for each transport stream packet.", + offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, + { "ts_packetsize", "Output option carrying the raw packet size.", + offsetof(MpegTSContext, raw_packet_size), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, 0, + AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, + { NULL }, +}; + +static const AVClass mpegtsraw_class = { + .class_name = "mpegtsraw demuxer", + .item_name = av_default_item_name, + .option = raw_options, + .version = LIBAVUTIL_VERSION_INT, +}; + /* TS stream handling */ enum MpegTSState { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
