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

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

commit 485b823b8484a920ce2e9542e07e6c7e43fd80d6
Author:     Nicolas Gaullier <[email protected]>
AuthorDate: Tue Aug 12 12:35:18 2025 +0200
Commit:     James Almer <[email protected]>
CommitDate: Wed Dec 10 14:09:51 2025 -0300

    avcodec/aac_ac3_parser: do not override the profile set by the decoder
    
    Parsing the ADTS header is not enough to detect HE-AAC v1/v2.
    
    Regression since 64bb91fd3b5a00a8849531c7e8dd207f2a626096.
    
    Fixes #11600
    
    Signed-off-by: Nicolas Gaullier <[email protected]>
    Signed-off-by: Michael Niedermayer <[email protected]>
    (cherry picked from commit f24474dcfc719e29dc87e6483d6187ea233f4e0f)
---
 libavcodec/aac_ac3_parser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index b49ce0277c..51c801214c 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -152,7 +152,8 @@ get_next:
                 ff_adts_header_parse_buf(buf, &hdr) < 0)
                 return i;
 
-            avctx->profile = hdr.object_type - 1;
+            if (avctx->profile == AV_PROFILE_UNKNOWN)
+                avctx->profile = hdr.object_type - 1;
             /* ADTS does not support USAC */
             s1->key_frame = 1;
             bit_rate = hdr.bit_rate;

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

Reply via email to