From 1096c46c55d6bbac5c2decbca49f083d079c1642 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sat, 23 May 2015 01:51:45 -0300 Subject: [PATCH] libwebp: use a separate AVClass for each encoder Signed-off-by: James Almer --- libavcodec/libwebpenc.c | 7 +++++++ libavcodec/libwebpenc_animencoder.c | 7 +++++++ libavcodec/libwebpenc_common.h | 8 -------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libavcodec/libwebpenc.c b/libavcodec/libwebpenc.c index 6896742607..4c22a9b04a 100644 --- a/libavcodec/libwebpenc.c +++ b/libavcodec/libwebpenc.c @@ -83,6 +83,13 @@ static int libwebp_encode_close(AVCodecContext *avctx) return ff_libwebp_encode_close_common(avctx); } +static const AVClass class = { + .class_name = "libwebp", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + AVCodec ff_libwebp_encoder = { .name = "libwebp", .long_name = NULL_IF_CONFIG_SMALL("libwebp WebP image"), diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index 40a694bde5..c1e2a1cb9a 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -124,6 +124,13 @@ static int libwebp_anim_encode_close(AVCodecContext *avctx) return ret; } +static const AVClass class = { + .class_name = "libwebp_anim", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + AVCodec ff_libwebp_anim_encoder = { .name = "libwebp_anim", .long_name = NULL_IF_CONFIG_SMALL("libwebp WebP image"), diff --git a/libavcodec/libwebpenc_common.h b/libavcodec/libwebpenc_common.h index 1126fd0a30..7e653dab2b 100644 --- a/libavcodec/libwebpenc_common.h +++ b/libavcodec/libwebpenc_common.h @@ -77,14 +77,6 @@ static const AVOption options[] = { { NULL }, }; - -static const AVClass class = { - .class_name = "libwebp", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - static const AVCodecDefault libwebp_defaults[] = { { "compression_level", "4" }, { "global_quality", "-1" },