virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

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

Browse Source 
This reverts commit 93a9ee7afd.

Was not fixing real problem, issue is probably outside of pan filter.
This commit is contained in:
Paul B Mahol 2023-02-09 13:40:00 +01:00
parent 25f31929b6
commit 458ae405ef
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/af_pan.c
View File

@ -313,9 +313,7 @@ static int config_props(AVFilterLink *link)
pan->channel_map[i] = ch_id; pan->channel_map[i] = ch_id;
} }
av_opt_set_chlayout(pan->swr, "ichl", &link->ch_layout, 0); av_opt_set_int(pan->swr, "uch", pan->nb_output_channels, 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
@ -335,8 +333,6 @@ 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]);
} }