har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/flvdec: Deduplicate AVClasses

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt 2021-06-07 16:13:33 +02:00
parent 779dba0fc0
commit e4ee2a0629
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/flvdec.c
View File

@ -1365,8 +1365,8 @@ static const AVOption options[] = {
{ NULL } { NULL }
}; };
static const AVClass flv_class = { static const AVClass flv_kux_class = {
.class_name = "flvdec", .class_name = "(live) flv/kux demuxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = options, .option = options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
@ -1382,14 +1382,7 @@ const AVInputFormat ff_flv_demuxer = {
.read_seek = flv_read_seek, .read_seek = flv_read_seek,
.read_close = flv_read_close, .read_close = flv_read_close,
.extensions = "flv", .extensions = "flv",
.priv_class = &flv_class, .priv_class = &flv_kux_class,
};
static const AVClass live_flv_class = {
.class_name = "live_flvdec",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
}; };
const AVInputFormat ff_live_flv_demuxer = { const AVInputFormat ff_live_flv_demuxer = {
@ -1402,17 +1395,10 @@ const AVInputFormat ff_live_flv_demuxer = {
.read_seek = flv_read_seek, .read_seek = flv_read_seek,
.read_close = flv_read_close, .read_close = flv_read_close,
.extensions = "flv", .extensions = "flv",
.priv_class = &live_flv_class, .priv_class = &flv_kux_class,
.flags = AVFMT_TS_DISCONT .flags = AVFMT_TS_DISCONT
}; };
static const AVClass kux_class = {
.class_name = "kuxdec",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
const AVInputFormat ff_kux_demuxer = { const AVInputFormat ff_kux_demuxer = {
.name = "kux", .name = "kux",
.long_name = NULL_IF_CONFIG_SMALL("KUX (YouKu)"), .long_name = NULL_IF_CONFIG_SMALL("KUX (YouKu)"),
@ -1423,5 +1409,5 @@ const AVInputFormat ff_kux_demuxer = {
.read_seek = flv_read_seek, .read_seek = flv_read_seek,
.read_close = flv_read_close, .read_close = flv_read_close,
.extensions = "kux", .extensions = "kux",
.priv_class = &kux_class, .priv_class = &flv_kux_class,
}; };