[FFmpeg-cvslog] avformat/v210: Deduplicate AVClasses
Andreas Rheinhardt
git at videolan.org
Thu Jul 8 21:42:42 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Jun 7 16:13:33 2021 +0200| [34276e9287639524442fb7ce6bd0ced30b83a6f6] | committer: Andreas Rheinhardt
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 at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34276e9287639524442fb7ce6bd0ced30b83a6f6
---
libavformat/v210.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/libavformat/v210.c b/libavformat/v210.c
index 361fd2a625..24f71d4014 100644
--- a/libavformat/v210.c
+++ b/libavformat/v210.c
@@ -87,14 +87,14 @@ static const AVOption v210_options[] = {
{ NULL },
};
-#if CONFIG_V210_DEMUXER
static const AVClass v210_demuxer_class = {
- .class_name = "v210 demuxer",
+ .class_name = "v210(x) demuxer",
.item_name = av_default_item_name,
.option = v210_options,
.version = LIBAVUTIL_VERSION_INT,
};
+#if CONFIG_V210_DEMUXER
const AVInputFormat ff_v210_demuxer = {
.name = "v210",
.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
#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 = {
.name = "v210x",
.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,
.extensions = "yuv10",
.raw_codec_id = AV_CODEC_ID_V210X,
- .priv_class = &v210x_demuxer_class,
+ .priv_class = &v210_demuxer_class,
};
#endif // CONFIG_V210X_DEMUXER
More information about the ffmpeg-cvslog
mailing list