Unified · Split
| @@ -75,7 +75,9 @@ static av_cold void uninit(AVFilterContext *ctx) · 74 unmodified lines | |||
| 75 | av_freep(&s->taps); | 75 | av_freep(&s->taps); |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | static av_cold int query_formats(AVFilterContext *ctx) | 78 | static av_cold int query_formats(const AVFilterContext *ctx, |
| 79 | AVFilterFormatsConfig **cfg_in, | ||
| 80 | AVFilterFormatsConfig **cfg_out) | ||
| 79 | { | 81 | { |
| 80 | HilbertContext *s = ctx->priv; | 82 | HilbertContext *s = ctx->priv; |
| 81 | static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } }; | 83 | static const AVChannelLayout chlayouts[] = { AV_CHANNEL_LAYOUT_MONO, { 0 } }; |
| @@ -84,15 +86,15 @@ static av_cold int query_formats(AVFilterContext *ctx) · 2 unmodified lines | |||
| 84 | AV_SAMPLE_FMT_FLT, | 86 | AV_SAMPLE_FMT_FLT, |
| 85 | AV_SAMPLE_FMT_NONE | 87 | AV_SAMPLE_FMT_NONE |
| 86 | }; | 88 | }; |
| 87 | int ret = ff_set_common_formats_from_list(ctx, sample_fmts); | 89 | int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts); |
| 88 | if (ret < 0) | 90 | if (ret < 0) |
| 89 | return ret; | 91 | return ret; |
| 90 | 92 | ||
| 91 | ret = ff_set_common_channel_layouts_from_list(ctx, chlayouts); | 93 | ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, chlayouts); |
| 92 | if (ret < 0) | 94 | if (ret < 0) |
| 93 | return ret; | 95 | return ret; |
| 94 | 96 | ||
| 95 | return ff_set_common_samplerates_from_list(ctx, sample_rates); | 97 | return ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates); |
| 96 | } | 98 | } |
| 97 | 99 | ||
| 98 | static av_cold int config_props(AVFilterLink *outlink) | 100 | static av_cold int config_props(AVFilterLink *outlink) |
| @@ -168,6 +170,6 @@ const AVFilter ff_asrc_hilbert = { · 69 unmodified lines | |||
| 168 | .priv_size = sizeof(HilbertContext), | 170 | .priv_size = sizeof(HilbertContext), |
| 169 | .inputs = NULL, | 171 | .inputs = NULL, |
| 170 | FILTER_OUTPUTS(hilbert_outputs), | 172 | FILTER_OUTPUTS(hilbert_outputs), |
| 171 | FILTER_QUERY_FUNC(query_formats), | 173 | FILTER_QUERY_FUNC2(query_formats), |
| 172 | .priv_class = &hilbert_class, | 174 | .priv_class = &hilbert_class, |
| 173 | }; | 175 | }; |