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/avfiltergraph.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/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 5389d82d9f..148eeba91a 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -362,7 +362,6 @@ static int filter_query_formats(AVFilterContext *ctx) int ret, i; AVFilterFormats *formats; AVFilterChannelLayouts *chlayouts; - AVFilterFormats *samplerates; enum AVMediaType type = ctx->inputs && ctx->inputs [0] ? ctx->inputs [0]->type : ctx->outputs && ctx->outputs[0] ? ctx->outputs[0]->type : AVMEDIA_TYPE_VIDEO; @@ -386,8 +385,7 @@ static int filter_query_formats(AVFilterContext *ctx) if ((ret = ff_set_common_formats(ctx, formats)) < 0) return ret; if (type == AVMEDIA_TYPE_AUDIO) { - samplerates = ff_all_samplerates(); - if ((ret = ff_set_common_samplerates(ctx, samplerates)) < 0) + if ((ret = ff_set_common_all_samplerates(ctx)) < 0) return ret; chlayouts = ff_all_channel_layouts(); if ((ret = ff_set_common_channel_layouts(ctx, chlayouts)) < 0) |