From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 674B643732 for ; Mon, 26 Sep 2022 00:35:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 952A968BB19; Mon, 26 Sep 2022 03:35:53 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2082.outbound.protection.outlook.com [40.92.90.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E0DB68BA9F for ; Mon, 26 Sep 2022 03:35:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nz/T8Hvui5vvqKh+YI/x5OL9q49I9V+74xWcYuilC8mF9YVib0WV1BAiUSskfwC0JYwmRiES6Gzbgs9FkIDXn53/cpVje7Rcf4cMhCfzJMRaiTCDkYFrUQXWq4Dslk17UhUns1GiaJg9hXAOAZ0/AN8qVTb9iTkMouqwiOSHleFgqnuJwuUoHUKDf27AgKln80W4jQfNcMUPCxSaA0knOIt5uyN2Yggi48Nd382kvUMCFxfpLCak/+Wkfey5d2u7fQW3jfa0bWa7ZGKdFKJ35jk1OqCEaAW/10M+rrWorbfAf0KXT48Y+PvGY+O42EKbbmSCNpkKNGZetPZRC2fWlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=+LfIvpe2A7USzzepLHC6VHhXxAqdf0pUNE0kWMokyXg=; b=HeaE9fOZzhO9ky7viCG9rT/N3h42W+EZJxdTTucP0mtJkyHOyqgIzg+XMQAGJiruKF/+0eD++MjjzHq6Jty3BE8vFhQC+WA+Riu/kvJ0KljLJc9RX0BN+/eWE3pdKFLq1Ko5/xwmPZedipyXcQGcTQ+U46rOA5jh+7ThpvEDcW7duIb4qg0gE4UQi7D4PjuEchp+f4EDokX3AK7juA2gsmcp3+gKIk0Q3l1KU4r6Wq2vtWO21HRqF0Rw3aAQUUTFZVJA/TBY89HJk4jOfqDAkHt9KCBf2cxXfoP2RT1xW4fUjF+cTaG6eo9YwfzBu0ZtRdRNHTHrL2ikn7FsE3ZhrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+LfIvpe2A7USzzepLHC6VHhXxAqdf0pUNE0kWMokyXg=; b=b4cNFLvELNixryFNG686e4l4u+RzazHW6+iXKnw6tiD6gHAoOMw21Duk8IEc18xr9+c9CWtGK3DpeafzBx7DwBjWhl7HX7vS479n/GVy+0t8RnZ485OqHAq+UXdBxSrrxElBCF6mgn4v5JSaKCwx/a6P7fULGdZz4t2sMraZYgy3qrZyKr6ro9m5wqboEgvTLYdc2Lja7EjSuG60cGs/z7/EUvi8zA36ZPARYCVAXgteu2+x+b5WcGv0IEI9qD/Sxrm8J9w/Zhy0iNA5YrBrDZLEo0OYeIGhMfKJY2GojCjrtj846U6wjQAhgStaMLeadVZUOoHj8Yn091i2laaDUA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0751.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:577::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Mon, 26 Sep 2022 00:35:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18%4]) with mapi id 15.20.5654.016; Mon, 26 Sep 2022 00:35:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 02:35:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [p1+Pk8b5BjAiDUsmVzHB8+EDNgcvnfLvNbIKYluyml4=] X-ClientProxiedBy: ZR0P278CA0105.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220926003545.3202750-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0751:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c13445a-5ca0-4d02-d0ab-08da9f570d05 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxLc5tmG8wxoWeNUlxOu28QCZNG6HIisiJ71k6r2tda6w3vjtevMVIrC5mqhgfgrhPlelJyS0QZLDkuo5+tWC42oCjizZavPx8wMFaEan3O4/JeOn3IlZwJgGh9Gz394ERRk73i2fuR0u7JIYd6TgOD3ADsqXyk+CUeRDwnMEBcWPDGBtBXF/43KWjRaipPfTTjWDvcJfKa7OJkIt40S4FxCrlXo5y4MKP9InlF2HTT1jS+v/UWlpXyQexDeqgmhCe6q+pmyoVi5xf4bPojCxb0nQAwUBRoc6XDH1NVw6rU9ESvN0cXY+50LOa1BA4mbvYIpCGFWc29Myesf6qfC37p+R3m22EZ/J6Z+mHgTcLGryRNVpHk+QcEVjoyUXmOEsMBzH2F+tsVx4h3VJufmmdJbe1tdOu+TTN985rzP9VdyPDcdvGCG6z44DFIsdE9H8dl5BntZj7dnp/DARGqbLk3zDno9VyEJDes29TMoSUKqt30aZVESXmbAGf6QyOMQZcezH+ZXCDtfSFvnhhPDN0b0x/WeCxb/tp+tI5REwVyNpo0T7JC751n+/TJFc8uusZCjpvuXMI7UjkQFJWa8mIjuRR7xrBTyRUQjgE/THRTw25Zq5e5ycAyolgJDKhI2/1jWR1g/J3bSgIcnqbJQ2GmPlyLQ6M9bQHFflkf6/q4Q4kW3C3kuDpi4tpg1WoIKVomap1jOOa+CBFPUcUpMgap8zLof2VcdLk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vpyXeUSahMNV15dXkPngaKP1cGw9D6aZSO49Q80XDkiz+dJFIN5bqK77cvCWRDqx2NtnnF+D41UxWnbZ0tiKQ6KrfRTp7Pa/h0Ey+guM+tjg/w3HhWgmGlLs+Xq76s+CrcTCipB6nG7uztPdvYyLhPvbykeecNEsDTt+ywJ5NHee5Ou82JMfYuodRVwizBZukAIID9B148ccpNpnNEPzZ4rp3M2tA0pOz3adoi9fl/wO9bRP2Ijant3Qf9bqhdV+nJgi4xOiSBRlBqMOqmP8qwJA3Nap+RJfThWehqCPGZBS3Gc/DjIn47d8pUY58fi4XnOg6/KXEMHACAoQsL0ixa8m89kdShkOeKWeHvVukUm+XuMCRCU90ESC1V7yZu3gAo0Y7csCZUdvC96yV1Be8Ma69d2/s1AOZ7yVm41XzITDkg76XM2jbz1+Vf1s/wsTH5HKd0/ouK0KlcLJPAq6zOUClPh008ffjpkCcIujWzH22VXQOb1i7kurM+Gq1mda3LQJdkJKoadb6cUw5ylQ3wWVZZZuIT7LyPoxpQsbA53VaiwZ7lv/XgoqaqqhIk+UohQPf/KQ30MlQFTk+2HGJ8Obhpb/LoDfe6lGREqY2hueEKBvGbrVwJrNbGXCudvs8Ef/Oa8QyMSidTC9hy5C1g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Rxqr9J4XugTogAph5sDjYdtti8QIoaprmn7YRQY4+abVK3YknuhsPmo/wEHr?= =?us-ascii?Q?j7MuMNKluH2HsdY/ScMl09cTq1XkuQIlrj6lsgVmCpSo0l9Kjw/M4c3RKrS3?= =?us-ascii?Q?WOYL5L6BdalIOxN3QgJ5Vhrc99iaGiHHyZzE5UoRmzbtiLdvoC2Meg/qd+Jf?= =?us-ascii?Q?/85oFbAljU6GABrIlhJFm0zDkedJYChY+xjFmAIoToZsEJ1K8esqnFwbRp9O?= =?us-ascii?Q?a9p2XpbeRWuhVD47NXyor2b/5zq6LDS93YaNt4PD3ob+FLI005PMvBJm9gMK?= =?us-ascii?Q?cNBbasJROBZ8GygkkBc0BBokSZJolW8bgfgX0CP50fdfE2Zv647PCP1F7usG?= =?us-ascii?Q?tb1T12mwVzXhwfQE2fTtLmt1sAAOHYpsgBCKq/MCSAU6PQbBOREYFlZAxlUg?= =?us-ascii?Q?2NtRbSwfc8vQy/k6qLzQn52wGcxnKiDDA7vHS7+OZhih8YyWUP52wdxTsCc6?= =?us-ascii?Q?GujJId9CBKuRuSJw6e4uSIr/uprZuWSSvOcPKZRbgDzHAvcaXKrdP2fHE2z5?= =?us-ascii?Q?uBiP8+xo+9BcfGoMN3Kl4W5UeP1KaDqFLlEKVaCb3YlhcLC6EA+EBrbtbX8F?= =?us-ascii?Q?5pA6fWwkJdIiVIh+UnovnKzYA1Q6w5edzSTeUmNnQ9Vi7qlG9iFQ+MOuWepj?= =?us-ascii?Q?7bY2+1vWlS+1gvhm6QB4QxT9Hx7umlAf2G50dFU5UUehLXCBuibXQSKZ3y8J?= =?us-ascii?Q?2d0y10ru7DF4uCpj3wzsZjmrNTV7T6HhsukO4fb0yfPn39/CWVQq+n7uZAho?= =?us-ascii?Q?5NJZs0kahR294ZWhPuS+cF68KU8GD22/sc6+x1iHJceUHAVLu9fADiR+s3Ju?= =?us-ascii?Q?+5K/SPKsU960m5090SNnpJSXD8O4JI/9uXjrrKJ02SxhSRCmPu3B1Hn/QzLw?= =?us-ascii?Q?aTVfgX/UffQ0MGz0dV7MPbDtxCcBK3AM5bDNxoBhXHKihyjYllatp35sBH35?= =?us-ascii?Q?77UTTQtgHxDQpmS9S39XTqIpLLSeQvtAezKp+EGIjpeDtMeeNFBxdk3mvfs5?= =?us-ascii?Q?v8fov5JDXV3NIO14HXDS2l+kvamElCUcBlu6mOqCDTprtOF36SJhXIAAsZRF?= =?us-ascii?Q?MqhXJ6dOMHAngoAWFRwTbZk54dDuwOCH2NFSRwiM9Wi7mnr8epbEvYRTF8jY?= =?us-ascii?Q?0L57R1ktor7hu875Xb3DO9xT8yeWiv03wZ1+aKpVQlMd/zY2WKPOo/0xNkcJ?= =?us-ascii?Q?ABw/KDuOnQ8b3rR2uq3T7JkndqclqDguB3gBwFYTKYmMysDWLp+2HSMXR/rW?= =?us-ascii?Q?xcu+5IUvx5VgNgi+XQ+cXSN4oZZMHvfkifmii1j3eRSNHISFB/p00fsl/tQ5?= =?us-ascii?Q?xHiWV3B2KMXx7xvj9k8gWRNF?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c13445a-5ca0-4d02-d0ab-08da9f570d05 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 00:35:45.7521 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P250MB0751 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/aacdectab: Remove empty channel layouts 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: Andreas Rheinhardt 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: They will be mistaken for the sentinel of the arrays they are in, thereby hiding the 6.1, 7.1 and 22.2 layouts. (This doesn't really matter, as these arrays are informational only for decoders.) Signed-off-by: Andreas Rheinhardt --- libavcodec/aacdectab.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index e03026806d..e38b93a534 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -73,7 +73,7 @@ static const uint8_t aac_channel_layout_map[16][16][3] = { }; #if FF_API_OLD_CHANNEL_LAYOUT -static const uint64_t aac_channel_layout[16] = { +static const uint64_t aac_channel_layout[] = { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_SURROUND, @@ -81,9 +81,6 @@ static const uint64_t aac_channel_layout[16] = { AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, AV_CH_LAYOUT_7POINT1_WIDE_BACK, - 0, - 0, - 0, AV_CH_LAYOUT_6POINT1, AV_CH_LAYOUT_7POINT1, AV_CH_LAYOUT_22POINT2, @@ -92,7 +89,7 @@ static const uint64_t aac_channel_layout[16] = { }; #endif -static const AVChannelLayout aac_ch_layout[16] = { +static const AVChannelLayout aac_ch_layout[] = { AV_CHANNEL_LAYOUT_MONO, AV_CHANNEL_LAYOUT_STEREO, AV_CHANNEL_LAYOUT_SURROUND, @@ -100,9 +97,6 @@ static const AVChannelLayout aac_ch_layout[16] = { AV_CHANNEL_LAYOUT_5POINT0_BACK, AV_CHANNEL_LAYOUT_5POINT1_BACK, AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK, - { 0 }, - { 0 }, - { 0 }, AV_CHANNEL_LAYOUT_6POINT1, AV_CHANNEL_LAYOUT_7POINT1, AV_CHANNEL_LAYOUT_22POINT2, -- 2.34.1 _______________________________________________ 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".