From 441b292592075b771dff7ee46293157eeb804252 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 10 Sep 2021 20:20:08 +0200 Subject: [PATCH] avfilter/internal: Add AVFILTER_DEFINE_CLASS_EXT This macro will allow to share options between AVClasses without having to redefine the option name (as is currently done) and will also allow to share the AVClasses itself (which is possible now that AVClass.child_class_next is gone). Reviewed-by: Paul B Mahol Signed-off-by: Andreas Rheinhardt --- libavfilter/internal.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 6ddf024d93..e7c154aff0 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -278,14 +278,16 @@ int ff_append_outpad_free_name(AVFilterContext *f, AVFilterPad *p); */ int ff_request_frame(AVFilterLink *link); -#define AVFILTER_DEFINE_CLASS(fname) \ - static const AVClass fname##_class = { \ - .class_name = #fname, \ +#define AVFILTER_DEFINE_CLASS_EXT(name, desc, options) \ + static const AVClass name##_class = { \ + .class_name = desc, \ .item_name = av_default_item_name, \ - .option = fname##_options, \ + .option = options, \ .version = LIBAVUTIL_VERSION_INT, \ .category = AV_CLASS_CATEGORY_FILTER, \ } +#define AVFILTER_DEFINE_CLASS(fname) \ + AVFILTER_DEFINE_CLASS_EXT(fname, #fname, fname##_options) /** * Find the index of a link.