From 18ec426a861c1a9a2072080796dff146bafecb53 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 10 Aug 2021 01:25:31 +0200 Subject: 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 Signed-off-by: Andreas Rheinhardt --- libavfilter/f_reverse.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'libavfilter/f_reverse.c') diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c index 2a85e6966e..2b3ffd28de 100644 --- a/libavfilter/f_reverse.c +++ b/libavfilter/f_reverse.c @@ -149,14 +149,7 @@ const AVFilter ff_vf_reverse = { static int query_formats(AVFilterContext *ctx) { - AVFilterFormats *formats; - AVFilterChannelLayouts *layouts; - int ret; - - layouts = ff_all_channel_counts(); - if (!layouts) - return AVERROR(ENOMEM); - ret = ff_set_common_channel_layouts(ctx, layouts); + int ret = ff_set_common_all_channel_counts(ctx); if (ret < 0) return ret; @@ -164,10 +157,7 @@ static int query_formats(AVFilterContext *ctx) if (ret < 0) return ret; - formats = ff_all_samplerates(); - if (!formats) - return AVERROR(ENOMEM); - return ff_set_common_samplerates(ctx, formats); + return ff_set_common_all_samplerates(ctx); } static void reverse_samples_planar(AVFrame *out) -- cgit v1.2.3