aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_fade.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-10 01:25:31 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-13 17:36:22 +0200
commit18ec426a861c1a9a2072080796dff146bafecb53 (patch)
treed3d8b683db1ff9b6a46fd6e828e0f4c7c94ed1be /libavfilter/vf_fade.c
parent55d9d6767967794edcdd6e1bbd8840fc6f4e9315 (diff)
downloadffmpeg-18ec426a861c1a9a2072080796dff146bafecb53.tar.gz
avfilter/formats: Factor common function combinations out
Several combinations of functions happen quite often in query_format functions; e.g. ff_set_common_formats(ctx, ff_make_format_list(sample_fmts)) is very common. This commit therefore adds functions that are equivalent to commonly used function combinations in order to reduce code duplication. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter/vf_fade.c')
-rw-r--r--libavfilter/vf_fade.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c
index 3c65b0f2ac..05ab762ec8 100644
--- a/libavfilter/vf_fade.c
+++ b/libavfilter/vf_fade.c
@@ -149,22 +149,20 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_GBRAP,
AV_PIX_FMT_NONE
};
- AVFilterFormats *fmts_list;
+ const enum AVPixelFormat *pixel_fmts;
if (s->alpha) {
if (s->black_fade)
- fmts_list = ff_make_format_list(pix_fmts_alpha);
+ pixel_fmts = pix_fmts_alpha;
else
- fmts_list = ff_make_format_list(pix_fmts_rgba);
+ pixel_fmts = pix_fmts_rgba;
} else {
if (s->black_fade)
- fmts_list = ff_make_format_list(pix_fmts);
+ pixel_fmts = pix_fmts;
else
- fmts_list = ff_make_format_list(pix_fmts_rgb);
+ pixel_fmts = pix_fmts_rgb;
}
- if (!fmts_list)
- return AVERROR(ENOMEM);
- return ff_set_common_formats(ctx, fmts_list);
+ return ff_set_common_formats_from_list(ctx, pixel_fmts);
}
const static enum AVPixelFormat studio_level_pix_fmts[] = {