[FFmpeg-devel] [PATCH 06/13] lavfi/af_aresample: convert to query_func2()

[Anton Khirnov]

Quoting Anton Khirnov (2024-09-02 15:50:06)
> ---
>  libavfilter/af_aresample.c | 23 +++++++++++------------
>  1 file changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
> index 2a67b06260..9ee4082c0c 100644
> --- a/libavfilter/af_aresample.c
> +++ b/libavfilter/af_aresample.c
> @@ -63,16 +63,15 @@ static av_cold void uninit(AVFilterContext *ctx)
>      swr_free(&aresample->swr);
>  }
>  
> -static int query_formats(AVFilterContext *ctx)
> +static int query_formats(const AVFilterContext *ctx,
> +                         AVFilterFormatsConfig **cfg_in,
> +                         AVFilterFormatsConfig **cfg_out)
>  {
> -    AResampleContext *aresample = ctx->priv;
> +    const AResampleContext *aresample = ctx->priv;
>      enum AVSampleFormat out_format;
>      AVChannelLayout out_layout = { 0 };
>      int64_t out_rate;
>  
> -    AVFilterLink *inlink  = ctx->inputs[0];
> -    AVFilterLink *outlink = ctx->outputs[0];
> -
>      AVFilterFormats        *in_formats, *out_formats;
>      AVFilterFormats        *in_samplerates, *out_samplerates;
>      AVFilterChannelLayouts *in_layouts, *out_layouts;
> @@ -84,15 +83,15 @@ static int query_formats(AVFilterContext *ctx)
>      av_opt_get_int(aresample->swr, "osr", 0, &out_rate);
>  
>      in_formats      = ff_all_formats(AVMEDIA_TYPE_AUDIO);
> -    if ((ret = ff_formats_ref(in_formats, &inlink->outcfg.formats)) < 0)
> +    if ((ret = ff_formats_ref(in_formats, &cfg_in[0]->formats)) < 0)
>          return ret;
>  
>      in_samplerates  = ff_all_samplerates();
> -    if ((ret = ff_formats_ref(in_samplerates, &inlink->outcfg.samplerates)) < 0)
> +    if ((ret = ff_formats_ref(in_samplerates, &cfg_out[0]->samplerates)) < 0)

Should be cfg_in. Fixed locally.

-- 
Anton Khirnov