RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/v210: 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>
This commit is contained in:
Andreas Rheinhardt 2021-06-07 16:13:33 +02:00
parent 072496ca40
commit 34276e9287
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/v210.c
View File

@ -87,14 +87,14 @@ static const AVOption v210_options[] = {
{ NULL }, { NULL },
}; };
#if CONFIG_V210_DEMUXER
static const AVClass v210_demuxer_class = { static const AVClass v210_demuxer_class = {
.class_name = "v210 demuxer", .class_name = "v210(x) demuxer",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.option = v210_options, .option = v210_options,
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
#if CONFIG_V210_DEMUXER
const AVInputFormat ff_v210_demuxer = { const AVInputFormat ff_v210_demuxer = {
.name = "v210", .name = "v210",
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
@ -109,13 +109,6 @@ const AVInputFormat ff_v210_demuxer = {
#endif // CONFIG_V210_DEMUXER #endif // CONFIG_V210_DEMUXER
#if CONFIG_V210X_DEMUXER #if CONFIG_V210X_DEMUXER
static const AVClass v210x_demuxer_class = {
.class_name = "v210x demuxer",
.item_name = av_default_item_name,
.option = v210_options,
.version = LIBAVUTIL_VERSION_INT,
};
const AVInputFormat ff_v210x_demuxer = { const AVInputFormat ff_v210x_demuxer = {
.name = "v210x", .name = "v210x",
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
@ -125,6 +118,6 @@ const AVInputFormat ff_v210x_demuxer = {
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "yuv10", .extensions = "yuv10",
.raw_codec_id = AV_CODEC_ID_V210X, .raw_codec_id = AV_CODEC_ID_V210X,
.priv_class = &v210x_demuxer_class, .priv_class = &v210_demuxer_class,
}; };
#endif // CONFIG_V210X_DEMUXER #endif // CONFIG_V210X_DEMUXER