diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-06-07 16:13:33 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-08 16:03:18 +0200 |
| commit | 072496ca40b03f8c7c46498f739e4246199426bb (patch) | |
| tree | 4ee529d0991120a7e66a6572d021a177d0fd1911 | |
| parent | 7ca0931fe1782fed54e508850c12bee7ee0a432a (diff) | |
| download | ffmpeg-072496ca40b03f8c7c46498f739e4246199426bb.tar.gz | |
avformat/segment: Deduplicate AVClasses
The child_class_next API relied on different (de)muxers to use
different AVClasses; yet this API has been replaced by
child_class_iterate.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavformat/segment.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index 24490f1280..ed671353d0 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -1045,14 +1045,14 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_SEGMENT_MUXER static const AVClass seg_class = { - .class_name = "segment muxer", + .class_name = "(stream) segment muxer", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, }; +#if CONFIG_SEGMENT_MUXER const AVOutputFormat ff_segment_muxer = { .name = "segment", .long_name = NULL_IF_CONFIG_SMALL("segment"), @@ -1069,13 +1069,6 @@ const AVOutputFormat ff_segment_muxer = { #endif #if CONFIG_STREAM_SEGMENT_MUXER -static const AVClass sseg_class = { - .class_name = "stream_segment muxer", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - const AVOutputFormat ff_stream_segment_muxer = { .name = "stream_segment,ssegment", .long_name = NULL_IF_CONFIG_SMALL("streaming segment muxer"), @@ -1087,6 +1080,6 @@ const AVOutputFormat ff_stream_segment_muxer = { .write_trailer = seg_write_trailer, .deinit = seg_free, .check_bitstream = seg_check_bitstream, - .priv_class = &sseg_class, + .priv_class = &seg_class, }; #endif |