diff options
| author | Paul B Mahol <onemda@gmail.com> | 2023-02-09 13:40:00 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2023-02-09 13:40:00 +0100 |
| commit | 458ae405ef2eca38e1d16ea3b494830cc686d678 (patch) | |
| tree | f49593ec8ea33ee6c44d3a493382547ca84a1136 /libavfilter | |
| parent | 25f31929b6ede49194ca9231560323829d4da67a (diff) | |
| download | ffmpeg-458ae405ef2eca38e1d16ea3b494830cc686d678.tar.gz | |
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.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_pan.c | 6 |
1 files changed, 1 insertions, 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]); } |