From patchwork Sun Sep 18 20:27:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38021 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858531pzh; Sun, 18 Sep 2022 13:28:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Akqo5Fn3/bgoF/7zzkY/dsMpSigE3f3BZ27HAc6z4LS3vH4ajRWQVPjTcfux7tBot9NZd X-Received: by 2002:a17:907:628f:b0:72f:57da:c33d with SMTP id nd15-20020a170907628f00b0072f57dac33dmr10741092ejc.374.1663532895168; Sun, 18 Sep 2022 13:28:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y1-20020a056402440100b0044e9151d561si9147751eda.542.2022.09.18.13.28.13; Sun, 18 Sep 2022 13:28:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=oEkuxOCA; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F098E68BBB4; Sun, 18 Sep 2022 23:28:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2078.outbound.protection.outlook.com [40.92.91.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1AA968BB01 for ; Sun, 18 Sep 2022 23:28:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oEczjhVk30eKaNrOFoUbTIlKgSbAyvl3LyhQs/MeBFOmYUEhWbSQdt4tlht9sW/BnIoZ+HBgeo13mUHgbvhqE3fG7NzBjF41BRWO/7aFQhgwC9KDrGQbqqmilmuvoat+8qa/fw3hKX+7cg2N0zzKh2uEokVcC0pFtdMEjDoUclQindEyHQV9r3schIUWbuJRZOtTXDCbX6xI7RPEue9YA/NpOEtlTZ+jKp/U+5kLTMyakj6WtKRkV9BycPCkKduDStVgu8ssqDfz5ZZBdmh7zchBKKWiY3T8ir/UQ61gyzo/GlzhzFDLjd5TRmsSMhOEffBtavlr03GATOWWXIu/jQ== 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=wHrqiiCuPDvVdhbpXZLHxgcsJPa1LMnVrvQtSSDOocI=; b=QG1NWxTu+os/LAT+qT2Gcxho2Ntb77/GAycMuDjotKW6DPaT/NVQPtlgdGwmcvdewOoD+O94en8fVUjZZjlqixeeMfcO6nqiH9vqa3tQbBwJokvAIV9t11ZwMDq7kPepBHPDnw/Kxy6OLX4De2FKcxFRUhrKt6BRkN9RHyq9RvgV9Hnwh1QHKE+sZK0WiOvrXmSLt7bS0deteGWaHR02pmYKmu+plhUh1qSiL3YqS0gzLD676+ik1YadPflQIlOlzCqGhxJKjZVWzf6xOVCYCtAPos+0CWoPA0XiMpqGXDVHJX1rq2Igu2xlkqC9WjYfOoNAWcGKyr+e165uaXgb3A== 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=wHrqiiCuPDvVdhbpXZLHxgcsJPa1LMnVrvQtSSDOocI=; b=oEkuxOCASN1kIsUOtT6vllSUsD3PMwPJAE7PuzOqQaoRNhBh6gFJztxDEzZK0MXBwwn07ffF3BYJzuAlHWUSvnE9+iqy7XpXXBrKk4Ds39IGwwYIcZ6mGuq3MRXZKVfrbxvmK7yrYqpFrKXorOVKCxAhJgCgBVqcYyO7wfMVNx5+xUUk89t1hrXhjRAM+avzWGl/YdQ9tPZDHgPFaHEMYAIROh2c/Fbytjvt5JgqKYr8bXBw+HPmt2Mxjfe13uf38SUTyqHOXXhZZLT4boivVdIGu3RgzmCw0oOCagzooSEfrdFCmBpe/F/3fXSk7IkS98N+dGkc1s6Ow8FWeaCEzA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0484.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.19; Sun, 18 Sep 2022 20:28:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%7]) with mapi id 15.20.5632.019; Sun, 18 Sep 2022 20:28:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:42 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [IhEa76RblWinN59plS0fydIkgjqKvbdEP8tCOZn2jlk=] X-ClientProxiedBy: ZR0P278CA0109.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220918202757.2345415-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0484:EE_ X-MS-Office365-Filtering-Correlation-Id: 69d19434-c398-49c3-743c-08da99b44944 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN51lXNz0Ne3XKx1/3P68o0/Qn6LyshoLu3r+ZFNYYS6wBFyy1a/rawwEQfvv7pIv2LKpEILnHMXaIn2v9x6l98zMcUVIzz4zVmSEylrfwbcAeP2Lzge96S2g17laUsuBxk3i8CaEuLLgnbInpdUCgag+3lBRO1SHvhdRebeAPV2tH+EpBTQlvCil6qqFFgBu4+DYOmq5DI5tYH/I7RAdzTGQD3L6KUUEIRRTYp75t/DSJndP0mkqigL2M/H3F8gInMuMMhVvVnbjDOQTcBAXACB9ytyHttaLBRIk4JPvmtm1hzxQAlcCF9V6GFOJgZOE1wLvvS38T5nVZRKxX4LRnP2siVomcFjNyoZ3AX7cVppbiEQ8zqH1wiWJ1FnXPBlNgK2b9S4YHSqlL/9DasIm3eT1Mt9EGGRrDqxmlhQdMQuJBHnv0jP+mo/0Fd8ormK2pm2y688Dbn8+aSooruw+nD4zO7KNnVJO3C7aHIHf/fbMI2NcXB2L9bShYVOlOCgZimrm4o61o23Yc8m4pvarM1crDVkIRUiVLFnPyCy9CgQ42poUKKDA0LoBFcFotuKWi8NZ/vksIO0VXUefo5JsFB4Qc4DrscEDVF/N0RwoJ1ir8XIZEDrqkALSIs/Q5URgxqmxORyPqCtyxh4wnJHOwRcKXcuY6C6UrqR1rxRBXxXFvSf/gGYRRvjudMa+UC9H4XbZJd3Ycgl1ByHWpzOukWdrjJ7hgHSAN7DmIH7ulJkc6A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wfsfVCu59kcv4zNkikHp+uo4+0+lLDP9WYkbNnrGJwrksXM5xnl99S6aqxHhWXyguw3Qyd7VgdnLcJrjN3/bow4hnupPRj9u1HI1UJbtjFCokc2OW6OvD3ycfnAqyRR52cYjxGVcNJUn89GpwGEZwIShf8DMrxuflbJn7PSZkX1OMDqQKbArsgnWsjR2uD9jPnAxGAizVDulrMQCCE5y0BNp2091CichNUWoloeZgiuZWIf16j260eM+4Y6a8N4Kqq3UE7VVtBNgUNRKyhInoMrmgL9Lw/M8N2CRcyiarTKHgGdzYTUPYNJ9rgf6sqICK/9YlHWqOUA5zAQwVgCvfTPnQ/PKnQnzSSQo0+q2KRQUJNQ2dRhsvDiBzyeRidS1gy9g8XVMFJLaG1cya+Y6iuTMfBcj9fCMGE4mO25WRCQvkcxs8nf+m79HQBZD3MQBXLZQxfqg0b8SwfvyGPnMCx3srhwaRYfvs/EOAAyFVBVgF3P0MoA/7EFX4c37e89HHmnGzQYSoe60iavmgKZ6PFdTY34hN2jZqs5QzYkKbo9/hB2naDaSNja8CBXsaVjsZSCNhhNB1stuEx5OnPWaN8QKS8usap17eDcDxb7B32CLKb9FPHXaJ0A+pbCFOY7LDXhDo75y4u8vU21TaV+B7A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yDIYKzMCoArH+8b/lz3G+JqrjyKe2EATjqhDVcb11KHKirdy8mFxqSPsG+up2jsqodry+Rmvz40/P+aJY8ftOgHvGoAkq8az4U9vvOIoI7rIzKQlFkDhEZXB8w4auKX2sXY7BelrqPr+VZfu5JbsPcZ/HfqTmXpK7TABCsxEgMkTHgVuJ0N0Hflicg6H1Ki4HfDykNosyLufxgmqjS7VUlga+IdpUsTLKYOi81j9U51njkAgZTpqCrT4xdlBQ1HsKob5YyaG9fouBSF6rl0nu2e1D4CsNgBoFWK2ljtskSUHxm6sSWKTnNTsjT93c9xSI+ulVKaVjgw1FCUCCvo+OHky39jt9MFlNPffmERGHAP4j4P4agAxwFwsqn/B64WAnxYQGthNYf4KrkGU5DVt84pJstSAIDV3PKeOQvZCUqIN4cHYFeawLC3HpeFa2v05tNg0nyxVT6sr7yi2Ys4vOv4G7t/S/ZXCtJFPQIEth+yam0w0YaoGOjxSKp8Yc11MpWNJPT2+wxAVLbTFbtBzW+IQYLEwQDXqsF/CChqNIn6gSERROXPpwAFUgNx62Klq42Amo+iySa0JlM2owBqoBiopfASqfmxFFIinSS4YeYrY9L2FhtmRkmm7RMX+QbS80WdKWllc/V41kn9CCRqmoGAbTzySwOE79r0KEs5kvS2dze3L+L8aBWlZ7ycWMGAnXkerXjAou38V3KuW6zJAfkk8gDuFPlXScjOqmbjUPFWg5FnwdJmyqK0QJYskxXBF3hdCbOZcEZSaJWmGd2NGFNcm2548lY6X1MU6sbcHPuknIypPqvEZN8APSzRzODSgHBi4CtuJCGiyymyLvVfbJsT3c89huDCYyMk3DHtaAy+kSl3LMw1IANjgYz9+NQA6WyIRDbWLe3jnZwogoahJAAojaui8MUgapAXFmUw8+Dx/DCp1BmMvt+zNtCFjbdlQoiP9CKzGtt2Sp+b0zjV/rYQy2917oIfAQB+JzW0Cj4b+Kv0jZJ/CI4IeAx4SnrdiMFUPMAFnZi5I1CffX6j+0ORMrMT0pAJ8ZehLFDm86YZXeWMW7bcJh7T/+O2eGkpsZ6QMoAqQ94QaPzebOsqYNs6LlsuK/fHJFMbWgbihfBM6YmPmLfGTr6+yBD8uq+kj9kuVby6XcD+9e5lzf2c6hOXYuhPl0cPbHNGDWYtnN7dMBUCzM6J36UQhKpQA2TMZ6tw6QqK0/IQoHRa9SqrXmeYYn4XxHQ7oy0jSrp7PaBdJMfTatDSFeo8AIAYFeVXNdr3TCzElPcOn3RihOyAJZJ5+yWkHhr69q5CzFqEHFTA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69d19434-c398-49c3-743c-08da99b44944 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2022 20:28:03.1075 (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: DU0P250MB0484 Subject: [FFmpeg-devel] [PATCH 02/17] avcodec/encode: Remove dead deprecated check 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: etfxdRtVp1H7 The wrapper for the legacy channel layout API already sets AVCodecContext.channels based upon AVCodecContext.channel_layout if the latter is set while the former is unset. Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index ade4d458e7..2168b88ea8 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -629,8 +629,6 @@ FF_DISABLE_DEPRECATION_WARNINGS buf, channels, avctx->channels); return AVERROR(EINVAL); } - } else if (avctx->channel_layout) { - avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout); } if (avctx->channels < 0) { av_log(avctx, AV_LOG_ERROR, "Specified number of channels %d is not supported\n",