[FFmpeg-devel] [PATCH v2 2/2] avcodec/aac_ac3_parser: do not override the profile set by the decoder

[James Almer]

On 7/7/2025 10:19 AM, Nicolas Gaullier wrote:
> Parsing the ADTS header is not enough to detect HE-AAC v1/v2.
> 
> Regression since 64bb91fd3b5a00a8849531c7e8dd207f2a626096.
> 
> Fixes #11600
> 
> Signed-off-by: Nicolas Gaullier <nicolas.gaullier at cji.paris>
> ---
>   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;

Should be ok.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: OpenPGP digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20250707/c0ec8f14/attachment.sig>