summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Gaullier <[email protected]>2025-08-12 12:35:18 +0200
committerMichael Niedermayer <[email protected]>2025-09-02 16:05:46 +0200
commitf24474dcfc719e29dc87e6483d6187ea233f4e0f (patch)
tree0be7453c1495b840209c4a5eb860547ffabdd1c8
parent593b4269027ea6d514b8505d317f6f131693c84e (diff)
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]>
-rw-r--r--libavcodec/aac_ac3_parser.c3
1 files changed, 2 insertions, 1 deletions
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;