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

Git pushed a commit to branch release/6.1
in repository ffmpeg.

commit a34013df6dd19885e639ca1a0e7d2780a66014f2
Author:     James Almer <[email protected]>
AuthorDate: Tue May 19 13:13:28 2026 -0300
Commit:     James Almer <[email protected]>
CommitDate: Sat Sep 19 21:16:19 2026 -0300

    avcodec/libfdk-aacdec: fix the check for downmix layout order
    
    The code reads a mask afer this check, meaning it expects NATIVE order, not
    others.
    
    Signed-off-by: James Almer <[email protected]>
    (cherry picked from commit 7755d264bdec8367fec467539b20d3dc73d18b92)
---
 libavcodec/libfdk-aacdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index 7a8554219d..20f0fdc653 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -276,7 +276,7 @@ FF_DISABLE_DEPRECATION_WARNINGS
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
     if (s->downmix_layout.nb_channels > 0 &&
-        s->downmix_layout.order != AV_CHANNEL_ORDER_NATIVE) {
+        s->downmix_layout.order == AV_CHANNEL_ORDER_NATIVE) {
         int downmix_channels = -1;
 
         switch (s->downmix_layout.u.mask) {

-- 
To stop receiving notification emails like this one, please contact
[email protected].
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to