[FFmpeg-cvslog] avfilter/avfiltergraph: fix regression in picking channel layout
Paul B Mahol
git at videolan.org
Fri May 23 01:41:36 EEST 2025
ffmpeg | branch: release/7.0 | Paul B Mahol <onemda at gmail.com> | Thu May 22 21:21:24 2025 +0000| [01e42959a5c0d9a64c85245101b65afc9775fd6a] | committer: James Almer
avfilter/avfiltergraph: fix regression in picking channel layout
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 1b3f4842c18409dba5a345ef9e7b3de7a4fa3657)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01e42959a5c0d9a64c85245101b65afc9775fd6a
---
libavfilter/avfiltergraph.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 8e091d95e0..f0a4e6fb66 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -1014,8 +1014,8 @@ static void swap_channel_layouts_on_filter(AVFilterContext *filter)
}
/* no penalty for LFE channel mismatch */
- if (av_channel_layout_channel_from_index(&in_chlayout, AV_CHAN_LOW_FREQUENCY) >= 0 &&
- av_channel_layout_channel_from_index(&out_chlayout, AV_CHAN_LOW_FREQUENCY) >= 0)
+ if (av_channel_layout_index_from_channel(&in_chlayout, AV_CHAN_LOW_FREQUENCY) >= 0 &&
+ av_channel_layout_index_from_channel(&out_chlayout, AV_CHAN_LOW_FREQUENCY) >= 0)
score += 10;
av_channel_layout_from_mask(&in_chlayout, av_channel_layout_subset(&in_chlayout, ~AV_CH_LOW_FREQUENCY));
av_channel_layout_from_mask(&out_chlayout, av_channel_layout_subset(&out_chlayout, ~AV_CH_LOW_FREQUENCY));
More information about the ffmpeg-cvslog
mailing list