From fe951a82dc6c75eced5b306a11ea5462a245c4c3 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 4 Jan 2023 17:13:16 +0100 Subject: [PATCH 1/3] avfilter/af_aresample: switch to convert frame API Signed-off-by: Paul B Mahol --- libavfilter/af_aresample.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index 971c861d0e..7923377c8c 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -209,18 +209,16 @@ FF_ENABLE_DEPRECATION_WARNINGS } else { outsamplesref->pts = AV_NOPTS_VALUE; } - n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out, - (void *)insamplesref->extended_data, n_in); - if (n_out <= 0) { + ret = swr_convert_frame(aresample->swr, outsamplesref, + (void *)insamplesref); + if (ret < 0) { av_frame_free(&outsamplesref); av_frame_free(&insamplesref); - return 0; + return ret; } aresample->more_data = outsamplesref->nb_samples == n_out; // Indicate that there is probably more data in our buffers - outsamplesref->nb_samples = n_out; - ret = ff_filter_frame(outlink, outsamplesref); av_frame_free(&insamplesref); return ret; -- 2.37.2