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/af_loudnorm.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'libavfilter/af_loudnorm.c') diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c index a07e8a3c93..f10429867f 100644 --- a/libavfilter/af_loudnorm.c +++ b/libavfilter/af_loudnorm.c @@ -685,7 +685,6 @@ static int query_formats(AVFilterContext *ctx) { LoudNormContext *s = ctx->priv; AVFilterFormats *formats; - AVFilterChannelLayouts *layouts; AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; static const int input_srate[] = {192000, -1}; @@ -693,19 +692,11 @@ static int query_formats(AVFilterContext *ctx) AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_NONE }; - 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; - formats = ff_make_format_list(sample_fmts); - if (!formats) - return AVERROR(ENOMEM); - ret = ff_set_common_formats(ctx, formats); + ret = ff_set_common_formats_from_list(ctx, sample_fmts); if (ret < 0) return ret; -- cgit v1.2.3