diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-09-04 15:11:22 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-09-09 17:26:18 +0200 |
| commit | 75b2f5a7d316c20dc36fdca213ec1285d6d7afbd (patch) | |
| tree | 12b0464acf22dd7bb63e0b32dd6dbdd49010089c | |
| parent | 4c4199758c9dcff7ef92f7de9af0f05c8935f580 (diff) | |
| download | ffmpeg-75b2f5a7d316c20dc36fdca213ec1285d6d7afbd.tar.gz | |
lavfi/af_sidechaincompress: convert to query_func2()
Also, drop redundant calls that also happen implicitly in generic code.
| -rw-r--r-- | libavfilter/af_sidechaincompress.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index 80c6e3cab1..d2bc63f5de 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -297,26 +297,27 @@ static int activate(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_NONE }; - int ret = ff_channel_layouts_ref(ff_all_channel_counts(), - &ctx->inputs[1]->outcfg.channel_layouts); - if (ret < 0) - return ret; + int ret; - /* This will link the channel properties of the main input and the output; + /* Generic code will link the channel properties of the main input and the output; * it won't touch the second input as its channel_layouts is already set. */ - if ((ret = ff_set_common_all_channel_counts(ctx)) < 0) + ret = ff_channel_layouts_ref(ff_all_channel_counts(), + &cfg_in[1]->channel_layouts); + if (ret < 0) return ret; - if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts)) < 0) + if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts)) < 0) return ret; - return ff_set_common_all_samplerates(ctx); + return 0; } static int config_output(AVFilterLink *outlink) @@ -371,7 +372,7 @@ const AVFilter ff_af_sidechaincompress = { .uninit = uninit, FILTER_INPUTS(sidechaincompress_inputs), FILTER_OUTPUTS(sidechaincompress_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .process_command = process_command, }; #endif /* CONFIG_SIDECHAINCOMPRESS_FILTER */ |