diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-10 01:25:31 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-08-13 17:36:22 +0200 |
| commit | 18ec426a861c1a9a2072080796dff146bafecb53 (patch) | |
| tree | d3d8b683db1ff9b6a46fd6e828e0f4c7c94ed1be /libavfilter/af_aiir.c | |
| parent | 55d9d6767967794edcdd6e1bbd8840fc6f4e9315 (diff) | |
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/af_aiir.c')
| -rw-r--r-- | libavfilter/af_aiir.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index 6ac39872ef..a396ec7885 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -79,7 +79,6 @@ static int query_formats(AVFilterContext *ctx) { AudioIIRContext *s = ctx->priv; AVFilterFormats *formats; - AVFilterChannelLayouts *layouts; enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE @@ -98,25 +97,16 @@ static int query_formats(AVFilterContext *ctx) return ret; } - layouts = ff_all_channel_counts(); - if (!layouts) - return AVERROR(ENOMEM); - ret = ff_set_common_channel_layouts(ctx, layouts); + ret = ff_set_common_all_channel_counts(ctx); if (ret < 0) return ret; sample_fmts[0] = s->sample_format; - 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; - formats = ff_all_samplerates(); - if (!formats) - return AVERROR(ENOMEM); - return ff_set_common_samplerates(ctx, formats); + return ff_set_common_all_samplerates(ctx); } #define IIR_CH(name, type, min, max, need_clipping) \ |