[FFmpeg-cvslog] Revert "avfilter/af_pan: fix regression introduced with switch to new channel layout API"

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Feb  9 13:40:00 2023 +0100| [458ae405ef2eca38e1d16ea3b494830cc686d678] | committer: Paul B Mahol

Revert "avfilter/af_pan: fix regression introduced with switch to new channel layout API"

This reverts commit 93a9ee7afd7bf2e019490117f1bada30724a0200.

Was not fixing real problem, issue is probably outside of pan filter.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=458ae405ef2eca38e1d16ea3b494830cc686d678
---

 libavfilter/af_pan.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 80c194b066..067f646805 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -313,9 +313,7 @@ static int config_props(AVFilterLink *link)
             pan->channel_map[i] = ch_id;
         }
 
-        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);
+        av_opt_set_int(pan->swr, "uch", pan->nb_output_channels, 0);
         swr_set_channel_mapping(pan->swr, pan->channel_map);
     } else {
         // renormalize
@@ -335,8 +333,6 @@ 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]);
     }