[FFmpeg-devel] [PATCH] lavf/segment: add stream_segment variant of the segment muxer
Stefano Sabatini
stefasab at gmail.com
Fri Jun 29 10:45:54 CEST 2012
This simplifies usage for segment streaming formats with no global
headers, tipically MPEG 2 transport stream "ts" files.
The seg class duplication is required in order to avoid an infinite loop
in libavformat/utils.c:format_child_next_class().
---
libavformat/allformats.c | 1 +
libavformat/segment.c | 19 ++++++++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index c3b8bb4..c8b9abf 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -215,6 +215,7 @@ void av_register_all(void)
#endif
REGISTER_DEMUXER (SEGAFILM, segafilm);
REGISTER_MUXER (SEGMENT, segment);
+ REGISTER_MUXER (SEGMENT, stream_segment);
REGISTER_DEMUXER (SHORTEN, shorten);
REGISTER_DEMUXER (SIFF, siff);
REGISTER_DEMUXER (SMACKER, smacker);
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 4a33c65..19d8855 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -269,7 +269,6 @@ static const AVClass seg_class = {
.version = LIBAVUTIL_VERSION_INT,
};
-
AVOutputFormat ff_segment_muxer = {
.name = "segment",
.long_name = NULL_IF_CONFIG_SMALL("segment muxer"),
@@ -280,3 +279,21 @@ AVOutputFormat ff_segment_muxer = {
.write_trailer = seg_write_trailer,
.priv_class = &seg_class,
};
+
+static const AVClass sseg_class = {
+ .class_name = "stream_segment muxer",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVOutputFormat ff_stream_segment_muxer = {
+ .name = "stream_segment,ssegment",
+ .long_name = NULL_IF_CONFIG_SMALL("streaming segment muxer"),
+ .priv_data_size = sizeof(SegmentContext),
+ .flags = AVFMT_NOFILE,
+ .write_header = seg_write_header,
+ .write_packet = seg_write_packet,
+ .write_trailer = seg_write_trailer,
+ .priv_class = &sseg_class,
+};
--
1.7.5.4
More information about the ffmpeg-devel
mailing list