This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 971da263617c32a03563511afa06fee24f0658b4
Author:     James Almer <[email protected]>
AuthorDate: Mon May 25 19:03:45 2026 -0300
Commit:     James Almer <[email protected]>
CommitDate: Sat May 30 21:37:33 2026 -0300

    avfilter/af_aresample: fix layout comparison when applying downmix coeffs
    
    out_layout at this point is a zeroed struct, and even after being filled 
below in the code
    it's ensured it will be the same as outlink->side_data.
    The actual check should be between inlink and outlink layouts. If they 
differ, then swr
    will do remixing and as such the downmix info side data will no longer be 
valid for any
    filter or encoder down the chain.
    
    Signed-off-by: James Almer <[email protected]>
---
 libavfilter/af_aresample.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index 7c6f9141a7..6c8e8e96ce 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -177,7 +177,7 @@ static int config_output(AVFilterLink *outlink)
         av_opt_set_double(aresample->swr, "lfe_mix_level", di->lfe_mix_level, 
0);
         av_opt_set_int(aresample->swr, "matrix_encoding", matrix_encoding, 0);
 
-        if (av_channel_layout_compare(&outlink->ch_layout, &out_layout))
+        if (av_channel_layout_compare(&outlink->ch_layout, &inlink->ch_layout))
             av_frame_side_data_remove(&outlink->side_data, 
&outlink->nb_side_data,
                                       AV_FRAME_DATA_DOWNMIX_INFO);
     }

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to