From de288e406ab2290477d753be3b584f86003125be Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 11 Sep 2021 14:15:51 +0200 Subject: avfilter/vf_hflip: Remove empty options and AVClass This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt --- libavfilter/hflip.h | 3 +-- libavfilter/vf_hflip.c | 8 -------- libavfilter/vf_hflip_init.h | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libavfilter/hflip.h b/libavfilter/hflip.h index 8532dc0f46..0d8b1025f3 100644 --- a/libavfilter/hflip.h +++ b/libavfilter/hflip.h @@ -22,10 +22,9 @@ #ifndef AVFILTER_HFLIP_H #define AVFILTER_HFLIP_H -#include "avfilter.h" +#include typedef struct FlipContext { - const AVClass *class; int max_step[4]; ///< max pixel step for each plane, expressed as a number of bytes int bayer_plus1; ///< 1 .. not a Bayer input format, 2 .. Bayer input format int planewidth[4]; ///< width of each plane diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index 09f4e08ea3..9f5958a392 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -26,7 +26,6 @@ #include -#include "libavutil/opt.h" #include "avfilter.h" #include "formats.h" #include "hflip.h" @@ -38,12 +37,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" -static const AVOption hflip_options[] = { - { NULL } -}; - -AVFILTER_DEFINE_CLASS(hflip); - static int query_formats(AVFilterContext *ctx) { AVFilterFormats *pix_fmts = NULL; @@ -155,7 +148,6 @@ const AVFilter ff_vf_hflip = { .name = "hflip", .description = NULL_IF_CONFIG_SMALL("Horizontally flip the input video."), .priv_size = sizeof(FlipContext), - .priv_class = &hflip_class, FILTER_INPUTS(avfilter_vf_hflip_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_QUERY_FUNC(query_formats), diff --git a/libavfilter/vf_hflip_init.h b/libavfilter/vf_hflip_init.h index d0319f463d..5c1d69b2b6 100644 --- a/libavfilter/vf_hflip_init.h +++ b/libavfilter/vf_hflip_init.h @@ -26,6 +26,7 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/error.h" #include "libavutil/intreadwrite.h" #include "hflip.h" -- cgit v1.2.3