From 99feb59cf7ea9d6753502d76110ced96f128dac6 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 26 Sep 2021 00:09:16 +0200 Subject: avfilter/formats: Make ff_formats_pixdesc_filter return AVFilterFormats* Up until now, it has returned the AVFilterFormats list via an AVFilterFormats** parameter; the actual return value was an int that was always AVERROR(ENOMEM) on error. The AVFilterFormats** argument was a pure output parameter which was only documented by naming the parameter rfmts. Yet nevertheless all callers initialized the underlying AVFilterFormats* to NULL. This commit changes this to return a pointer to AVFilterFormats directly. This is more in line with the API in general, as it allows to avoid checks for intermediate values. Reviewed-by: Nicolas George Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_weave.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'libavfilter/vf_weave.c') diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c index 60e37a1037..52fb4c684d 100644 --- a/libavfilter/vf_weave.c +++ b/libavfilter/vf_weave.c @@ -51,15 +51,9 @@ AVFILTER_DEFINE_CLASS_EXT(weave, "(double)weave", weave_options); static int query_formats(AVFilterContext *ctx) { - AVFilterFormats *formats = NULL; - int ret; + int reject_flags = AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_HWACCEL; - ret = ff_formats_pixdesc_filter(&formats, 0, - AV_PIX_FMT_FLAG_PAL | - AV_PIX_FMT_FLAG_HWACCEL); - if (ret < 0) - return ret; - return ff_set_common_formats(ctx, formats); + return ff_set_common_formats(ctx, ff_formats_pixdesc_filter(0, reject_flags)); } static int config_props_output(AVFilterLink *outlink) -- cgit v1.2.3