From 8e948899d7db4e92c0b728c59f4f2501a4c72bb6 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 4 Feb 2023 21:46:15 +0100 Subject: [PATCH 1] avfilter/af_pan: fix regression introduced with switch to new channel layout API Fixes #10168 Signed-off-by: Paul B Mahol --- libavfilter/af_pan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 067f646805..80c194b066 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -313,7 +313,9 @@ static int config_props(AVFilterLink *link) pan->channel_map[i] = ch_id; } - av_opt_set_int(pan->swr, "uch", pan->nb_output_channels, 0); + av_opt_set_chlayout(pan->swr, "ichl", &link->ch_layout, 0); + av_opt_set_chlayout(pan->swr, "ochl", &pan->out_channel_layout, 0); + av_opt_set_int(pan->swr, "uch", link->ch_layout.nb_channels, 0); swr_set_channel_mapping(pan->swr, pan->channel_map); } else { // renormalize @@ -333,6 +335,8 @@ static int config_props(AVFilterLink *link) for (j = 0; j < link->ch_layout.nb_channels; j++) pan->gain[i][j] /= t; } + av_opt_set_chlayout(pan->swr, "ichl", &link->ch_layout, 0); + av_opt_set_chlayout(pan->swr, "ochl", &pan->out_channel_layout, 0); swr_set_matrix(pan->swr, pan->gain[0], pan->gain[1] - pan->gain[0]); } -- 2.39.1