[FFmpeg-cvslog] avfilter/avfiltergraph: fix regression in picking channel layout

[Paul B Mahol]

ffmpeg | branch: release/5.1 | Paul B Mahol <onemda at gmail.com> | Thu May 22 21:21:24 2025 +0000| [e09bd41752491627b4d52e8c76d3d5cfd4b2d7ba] | 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=e09bd41752491627b4d52e8c76d3d5cfd4b2d7ba
---

 libavfilter/avfiltergraph.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index b7dbfc063b..43b3f667d3 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -938,8 +938,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));