From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id E5A174C37F for ; Mon, 7 Jul 2025 13:20:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 86F986911A4; Mon, 7 Jul 2025 16:19:50 +0300 (EEST) Received: from PR0P264CU014.outbound.protection.outlook.com (mail-francecentralazon11022142.outbound.protection.outlook.com [40.107.161.142]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A8B7C69104F for ; Mon, 7 Jul 2025 16:19:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=e9ize0pk0xx4ET6nPEaF1sdy1MU+MvT9hiHmVXcyYa9/xOX7pmbkivJ5lArLREmYvg5RxKT+iqffUWX56KHQtzUt8p5a73PPUwnjHeA6SHvAgOW65NgtrtOCo/dn9YGAmV6Yh498PsA/89Xz/NsqcMpQbe7CNNeJcCChRC7KAKd+tTBJv2EU9y8Isi2Z0ZHk711bwELFeia3LFcP9fwgXC+uaQWVemajEFe9H1gBsv115edfMEbJSrDgkYwVHA/xR71lClPX2km8UFhlHnvtw3hh+Hsthim3F6g54gjcN0pql697+fc7gTBEJE0v5H4S/xX909a+m4ubeDm7YygB0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4DF/kTbo8p0tth1KhhKWQAyB9E7udi+OQkV9hdFX6Y0=; b=ZZE0/oAhsGwu792uuo3Ma5fLSDy9ywNVFOiIuaw/C05y2RzpT/nr5s4jGBjFcLYafKH0rtDHAkGCapyzxRAEOQfZtx8HUb6EKoqZcbbeyR8S/iPN0m1oR80kY4uw9zFr0BCLRanKD0AODMeVAJj1rnqmKXspvSchwetFHjOqsGmocI4ZDWcTbdLf7pO06FUX3W/2eg+aXcWRyJ2Yy7cYJuLxoJcGbIIvTKd+g9Q+rwXKn2VuFJDLeiTGW7h7Z/4dJaJpzoNLpO2ylVJ+h/DiHfj2kII1aH7SfFfOaxqmq1grrNLcHoBiMxrA83ZhnDJLRBxzbKLss799YWCFzxpgnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cji.paris; dmarc=pass action=none header.from=cji.paris; dkim=pass header.d=cji.paris; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cjiparis.onmicrosoft.com; s=selector1-cjiparis-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4DF/kTbo8p0tth1KhhKWQAyB9E7udi+OQkV9hdFX6Y0=; b=JH1FfPoLVkqBQgfpGTi6rqbN62/2deTlugue7eQ+bBlnBe0hkmmnoD9qafxUN2MpsNsM5MJhfAmXNxafLLkaM2GYNDaNYW434AEuZ/wkjbC4dlb7qy0qg9Zw3+4CO7qS5Njy/JFhQzfKUTDvbQyJ2wn3F70JUD6fitsi8CLyu9iTr4Inv40YyPxpXHeKf5Eu236yV0OHuhsrtKcXCGjGpbFAjpYi/h+krnInetRFJrRp71E4GZHGWIzEovawLI18xYLTqUfi/jJwV4jVCx6MKJD8xYvXYsTjhXey7OfXiJpsXvNTxlYlFsYKKBc4k8xB5n5PJl0BM4ARkWw6RSaJOA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cji.paris; Received: from MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::23) by PARP264MB4576.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:42c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Mon, 7 Jul 2025 13:19:35 +0000 Received: from MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM ([fe80::a9db:c8aa:ffcb:e463]) by MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM ([fe80::a9db:c8aa:ffcb:e463%5]) with mapi id 15.20.8901.023; Mon, 7 Jul 2025 13:19:35 +0000 From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Jul 2025 15:19:21 +0200 Message-ID: <20250707131930.2924213-2-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250707131930.2924213-1-nicolas.gaullier@cji.paris> References: <20250707131930.2924213-1-nicolas.gaullier@cji.paris> X-ClientProxiedBy: PA7P264CA0234.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:372::15) To MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:34::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MR1P264MB2483:EE_|PARP264MB4576:EE_ X-MS-Office365-Filtering-Correlation-Id: 3205210a-fb54-4353-9138-08ddbd58eab6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?PDT9DhxPZPGA60ARZkhSyqzTInDApAPk6ZKfNQ2BBqccE2+86NnthX1/Bp5r?= =?us-ascii?Q?zcLfQwIinBulbiMgIc808LaKT5zemcBOhTumCgakWhralD3O7/6QW1uCFpkj?= =?us-ascii?Q?jGQ4pe8gIawDuxj3rcPJfgJI9ZldBUgOCGbixltE7dT+t2jkJDgRD79kLlT3?= =?us-ascii?Q?uwIS9PHL4t/cxLTnXssT0nFbjJar0v0N6zkhTmpl3wzHhiUIi5KSPLNcUotu?= =?us-ascii?Q?deGXEx0YgPugz5HUWsssvN55ZdLa7W7BfYMrSOTSEGS5CatUjCPoVneg7m8q?= =?us-ascii?Q?4GSD/irJOkNMJVhbCDu3fw2uMAji+QP3XACGrFDxCQQedpUgQRnLvpqjFUzr?= =?us-ascii?Q?sUXsp6o1jHrq542oAOSv0afaIxdTXHvaw6tZQAIbt86lDEvVQunCLbd7tiU+?= =?us-ascii?Q?RXBJpUdsMJdkr4xjykRtHE/04oqGkSnSmCIbN06oxfObhQVwT5gK6aGFIkXg?= =?us-ascii?Q?mfcLQw0oVYwtD+q92appVuLBwRdDYDx6P9DfnmwgKmqpMOMpH0WnzxUWlmaN?= =?us-ascii?Q?jLGTe68L+u/O4aH0bkGn8j+2N03+8N4oh5zt8yIF0W+AFJGXRn5zICG6lLIg?= =?us-ascii?Q?Wlt4wgKt2Guocn+6KEkRk4YepvlySf6dGTU5q818JwShv7LFWIPxoDVg3Sv/?= =?us-ascii?Q?p9CFt7nys/h+H+XNOKQBu6gWsb7l//SOjzgdVkEgitTooni7MlqP8e6TgYsG?= =?us-ascii?Q?N5rV3qV+J7qKf9ZEmoyBCfNV4AC4uJJ03+6/aRFKxAqsCKkf1Jtril6/sONB?= =?us-ascii?Q?ndDF2JsBd0LxZn/D9Glh2/2MeUhUNrDCl0JnXcxvPAGTbITomzwxMqhi2KZP?= =?us-ascii?Q?6fA7JMNN32q4fSDX4PNiuzmwMPfyaMREghMR3XR3kidJGJyaYvF1kwZ2KhJ7?= =?us-ascii?Q?JZ28z7ShLMkPJqPIZyiDALb1PG0C6wwuhn9QhC66uIb6tRn0LocEr4KDOmC6?= =?us-ascii?Q?N20qJjDiBH1C/MGD3b6J43+/DtTW47+hQ4yzVB3Jj6yl7gCGOpuOaED2EEWV?= =?us-ascii?Q?R28cshorXU3bl538X85Ph+/S5/8bs2V6nLKDIgV2wwVuJNZ65uCU6Mo4PlFN?= =?us-ascii?Q?PLGqDnd8wQMsUPma0H4+M1+xkZ7vH2oynlxVHJZBCnkZ5Q5qNhkB66/T5Unb?= =?us-ascii?Q?PhcqtyqKpxpCzlyzQUBRv6arqRpelWQ8YCZknB9GDRni3/wkFJxNMRqhqFnk?= =?us-ascii?Q?sMedrIpwzsKUMV9UgmmGA0h5ON/55y/K4MWC8q3ADQI/uxiGH2xvBAWNNPWL?= =?us-ascii?Q?BAE7IjGmyBJM2edBBIEZ6Jdu/hYqK0Wa5xPtKrKOtMcAfGFKPyy6gXi2zA8V?= =?us-ascii?Q?840i5X7jDUgp9FDpi49j0ssBXMu8dOn/CfsrzSF4f63QPb4AFXrkqI1gbRsR?= =?us-ascii?Q?MzzCyTm4BaMJq9kl882AWM0jSjENlWw9RJzZbzEd4z0QwbBxH2R1fpfX4D0w?= =?us-ascii?Q?gxkaucnyMA4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DWf5ZfEeZY1a3EGmEq/fD/Y83g/HBPKEnlK6gDlmSv7dqCKBAah5q61necPD?= =?us-ascii?Q?+96JDt9SI83JE9MPmoIt5II/IOa3VsPURny54LX/xArL1jSRScvJEWExtf7f?= =?us-ascii?Q?OcmCSVYvZsUCet8/A3rm3YVkvEu1G5hZBzTm/9tAlKQfLoSbqP9kF9Fcf6wY?= =?us-ascii?Q?hpyrFRE0ucNyZkSJkyvyaYmW50m9aLOZxXJ5DATekbkfZBs8rri+OxT5+IAu?= =?us-ascii?Q?92WD1OlwFuHWymLfbz7EMPxty6GpsMuceMRGkQ/veisoY5zxdT7r4OtJGqRa?= =?us-ascii?Q?Knk7kDGigOaDC5dZA+Y7gLWSk5WQQMq4u90ncIP0qRi4GAdrikvIAfg9yPOh?= =?us-ascii?Q?NRsvGMOlnZRux2t/+NMY/+jd9SFs6RosSCiPqX/oolBer8GRe63TQlsT6Znw?= =?us-ascii?Q?hyojE1qzK3Kv9LgEOkXrCIsRzMKMxBVQtZYz6BT0Pb2ddC/eb9voWof1c333?= =?us-ascii?Q?wmTVsKLjQWT4dewTVIrHkTExbTYojDJDSIYTIb5aOL/xTYV9yPBIgGdP3fA4?= =?us-ascii?Q?meDhAyxcrJfgwgpXxN/qKBlbCci+nZmdO/cqrW2mKqyPytLzvWJQTzsCv+9X?= =?us-ascii?Q?zfTtc07jOY5EgZiF1sJwHUvW2LRYpVXg6ItB00L+b2lTGeLcO0BUVMGLW9qR?= =?us-ascii?Q?orUKpTn2kqsipa3Nv2m5oQm1oXn85w8arNqDerkYsp4yEv+6qiC6qNiosZMj?= =?us-ascii?Q?ys0qj0kmBMZeHXlmnzUaEdyKEShLrnVjA+Ivah2P/QcICt+w1AlTDO6jZ17T?= =?us-ascii?Q?YCv5V+U1OKNxwbThBKrenAFGP3fDmVfqs9nZNMFyGgzsmNCPIIc0CiSj6yT+?= =?us-ascii?Q?ve7UjLuNKQe/qxIkRpb9itka6OGzwrA7larMUoZuBEQqgg5Ttsr1dHwBdcRk?= =?us-ascii?Q?sZXliePqYuAyPDvdiJhwgNqWkxHCYnb9DNidnyhuEPljvyGeWc4NIlwt8fAK?= =?us-ascii?Q?raFcUIDFTKB3lr+XY7HpxyZpjXfN2AStCcpUvYiHIlYJa8CdjCFisb+za/ai?= =?us-ascii?Q?U+cWBnbXuvajqBotKx4Rsue64LJJQB7oKmXzXVFwbZiScitig1j3ca9+CSVk?= =?us-ascii?Q?8qaCIkFW6dCjgajk6QaOdIHUHsZIsqw8Gy7ZdtxGJDzIoUXzeKOv7Pb83taf?= =?us-ascii?Q?15N1gGZDmydiKTxsjRt8HT80f7gX93A4A5HG8mvtO9e86FrN1veWDRhwflfR?= =?us-ascii?Q?2LuQZI4jRO09s0OZ3FxrX17ebkVN2YB0ng722Tz8A6HTdyTcTsy0yln9QGo+?= =?us-ascii?Q?ORwAdvcZMOgz7in9uzuXHHAbJaLS1mfEaBJn8EuVA8ttXdzpnFtNQMorH9Oy?= =?us-ascii?Q?iLgLQNgZzZC3agsWUXm45c2FIH48D4iIZ4yuQHDpxG4A+kcnxhU+9ZaSrSa3?= =?us-ascii?Q?jYJ/XbzH2xHpjNZl3fpi8YHWg/a3dmj/ZuOkrtDTpVaPtxy5YA+HQCvR/kVw?= =?us-ascii?Q?L35cIhlwmlDRQ2USM+3u+72mZLbQFWPVclo0WJipmuQPsS23Vgq1HCyGwVQ7?= =?us-ascii?Q?n4jQW9ek2XGO0yTONdiDaFWGCAnTOGYfMDuH7iuFV6JpSlDXEbCBSZqkdoqX?= =?us-ascii?Q?A6e1BXPVaunB6wJLaEQBUbpzekCgwek+W49WWxg/wjzd2OKZv0/HnNPY0vrC?= =?us-ascii?Q?mw=3D=3D?= X-OriginatorOrg: cji.paris X-MS-Exchange-CrossTenant-Network-Message-Id: 3205210a-fb54-4353-9138-08ddbd58eab6 X-MS-Exchange-CrossTenant-AuthSource: MR1P264MB2483.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2025 13:19:35.0509 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fc5390bc-7da7-4e42-b72b-a373be305b62 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: siIiIVSYPd/0tyXCvKSVpZv/ciZ9klMFmWaexE2sFobVBUpdHdQdCcYzZlI2yb9rYEn7Zn6hn8oSV5cPBJuqho6qdxbNMhQ6ZwYsOjq+ACk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PARP264MB4576 Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/aac_ac3_parser: do not override the profile set by the decoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nicolas Gaullier Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Parsing the ADTS header is not enough to detect HE-AAC v1/v2. Regression since 64bb91fd3b5a00a8849531c7e8dd207f2a626096. Fixes #11600 Signed-off-by: Nicolas Gaullier --- 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; -- 2.47.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".