Also, drop redundant calls that also happen implicitly in generic code.
Unified · Split
| @@ -297,26 +297,27 @@ static int activate(AVFilterContext *ctx) · 296 unmodified lines | ||
| 297 | 297 | return 0; |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | −static int query_formats(AVFilterContext *ctx) | |
| 300 | +static int query_formats(const AVFilterContext *ctx, | |
| 301 | + AVFilterFormatsConfig **cfg_in, | |
| 302 | + AVFilterFormatsConfig **cfg_out) | |
| 301 | 303 | { |
| 302 | 304 | static const enum AVSampleFormat sample_fmts[] = { |
| 303 | 305 | AV_SAMPLE_FMT_DBL, |
| 304 | 306 | AV_SAMPLE_FMT_NONE |
| 305 | 307 | }; |
| 306 | − int ret = ff_channel_layouts_ref(ff_all_channel_counts(), | |
| 307 | − &ctx->inputs[1]->outcfg.channel_layouts); | |
| 308 | − if (ret < 0) | |
| 309 | − return ret; | |
| 308 | + int ret; | |
| 310 | 309 | |
| 311 | − /* This will link the channel properties of the main input and the output; | |
| 310 | + /* Generic code will link the channel properties of the main input and the output; | |
| 312 | 311 | * it won't touch the second input as its channel_layouts is already set. */ |
| 313 | − if ((ret = ff_set_common_all_channel_counts(ctx)) < 0) | |
| 312 | + ret = ff_channel_layouts_ref(ff_all_channel_counts(), | |
| 313 | + &cfg_in[1]->channel_layouts); | |
| 314 | + if (ret < 0) | |
| 314 | 315 | return ret; |
| 315 | 316 | |
| 316 | − if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts)) < 0) | |
| 317 | + if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts)) < 0) | |
| 317 | 318 | return ret; |
| 318 | 319 | |
| 319 | − return ff_set_common_all_samplerates(ctx); | |
| 320 | + return 0; | |
| 320 | 321 | } |
| 321 | 322 | |
| 322 | 323 | static int config_output(AVFilterLink *outlink) |
| @@ -371,7 +372,7 @@ const AVFilter ff_af_sidechaincompress = { · 48 unmodified lines | ||
| 371 | 372 | .uninit = uninit, |
| 372 | 373 | FILTER_INPUTS(sidechaincompress_inputs), |
| 373 | 374 | FILTER_OUTPUTS(sidechaincompress_outputs), |
| 374 | − FILTER_QUERY_FUNC(query_formats), | |
| 375 | + FILTER_QUERY_FUNC2(query_formats), | |
| 375 | 376 | .process_command = process_command, |
| 376 | 377 | }; |
| 377 | 378 | #endif /* CONFIG_SIDECHAINCOMPRESS_FILTER */ |