virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

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

Browse Source 
Fixes #10168
This commit is contained in:
Paul B Mahol
2023-02-04 21:46:15 +01:00
parent df4ab69cfa
commit 93a9ee7afd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/af_pan.c
View File

@@ -313,7 +313,9 @@ static int config_props(AVFilterLink *link)
pan->channel_map[i] = ch_id; 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); swr_set_channel_mapping(pan->swr, pan->channel_map);
} else { } else {
// renormalize // renormalize
@@ -333,6 +335,8 @@ static int config_props(AVFilterLink *link)
for (j = 0; j < link->ch_layout.nb_channels; j++) for (j = 0; j < link->ch_layout.nb_channels; j++)
pan->gain[i][j] /= t; 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]); swr_set_matrix(pan->swr, pan->gain[0], pan->gain[1] - pan->gain[0]);
} }