From patchwork Tue Oct 18 13:31:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38802 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2108272pzb; Tue, 18 Oct 2022 06:32:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6UWx3iI9PoSi/5C+BqlS1V+92sKD2+yUcDJZBUjidzLD0cumK12dgpBdO3B5pDSUbDKIil X-Received: by 2002:aa7:c698:0:b0:458:8274:12ac with SMTP id n24-20020aa7c698000000b00458827412acmr2659625edq.351.1666099943857; Tue, 18 Oct 2022 06:32:23 -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 y18-20020a50e612000000b0045caa1628c6si11261641edm.216.2022.10.18.06.32.23; Tue, 18 Oct 2022 06:32:23 -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=HsYrMuOz; 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 CAD8A68BD62; Tue, 18 Oct 2022 16:31:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073011.outbound.protection.outlook.com [40.92.73.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65FBC68BDA9 for ; Tue, 18 Oct 2022 16:31:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m1H8u7H9SSeeTHxVMuvPuTU6veaJQqyX29paE1OKscWYGz0PbyxA/UpAVAHeZFEPYL3lYpqJRpFXAHq7SKRJyhrw4MKJLxi5eZmhcyv9fWYeqNbx5IM5iNtwUGVqMUcvuvT5RQc0X2iVRyQH4JHHOHLe6khhT/cLcskw1OQ1DfbQcmqIDc+4b1UjiFW0iz2TR0pd0o+ut7WxDNzztnNz18rvmGZM9yT+wGc7QaSfcYR2kRIZ30PN32TLZ8mtkNd1md29XfIe034qbTSKomto2XZnPNjQAp/tNw3t5xA4V12yI17czcvKugi4B3gN9T1POTcazrMUQLylnIYPfbfQpA== 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=1KB/xzPVMkDrmC9eyySoOI0zCnD/HqtB0m5z4zAyA34=; b=hlVz1BINI408AfSTXVoj4XyZuW5W88WeWS7f4aDeinriwjYIHSe0xA6K2Eu/n2wT86qB4foVu6GN1f6LWZMWTa8dxiuqZCsvUU4D6HrqQd8rrF57DKK9AWtQtwJlYXeC8i9uagK3s5TYv13QBayrFaqlYeWSE3S/r5rlHOzElRXKAAkdvffMn3jWkTnN7LfwOY808o+cJ4XOFjJvmSOE/vvcxkO8vweMEKih7pPwQgAHq7hAGfxWIlHVCSrz/TNh/5baRvdNP3rvAlHsBPwRDB5B9A0ZtSV4+K4N9NJu/y3nKwSUBn+AdItS8Pe5sbTNu4sTCiQ2NO4d2iGfEHGEXw== 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=1KB/xzPVMkDrmC9eyySoOI0zCnD/HqtB0m5z4zAyA34=; b=HsYrMuOzksB/mepwQpluc8TscaG4Khmp3ascN0tAuHUQbxNZhD4SHO3uUonGBcLNt5hztcokA5HDK8lbw75Lpu/RvEw4gcW8ud598JUehxeONENcOSjEprmJzK7CXGqIQzwzumHAhU47S5JR1PH3Q7E4mSz61yQmUv5ahmFCUc1SU329QBwvWflAW3nl8dJbaoFPuIucyId+zK/tC24nZcaD73RQCOUTLnkO69GDegitTGA3xs2bX8IxsRHOKAoO+7i+5eWXuDHhI4t4MCwZ0b9P0sR07M4XZ9+RnZCEYhyWePftnVe7G4pVNMcus1tfXs0cx1sLbq1spTh05XhVgA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB4P250MB1005.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.29; Tue, 18 Oct 2022 13:31:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:31:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:31:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YWGqUQlndgy5cUkHbWZvMkKYC/yoqjctGCIAJNct+fQ=] X-ClientProxiedBy: FR3P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133126.313251-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB4P250MB1005:EE_ X-MS-Office365-Filtering-Correlation-Id: 85e83419-8775-47b5-62a7-08dab10d19cb X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyWK/3+84QDQBoTi7p2w6m6CJ+IcjkONt6WyYM7tWUll2WSFA1wrjvaUzYRUiNZIbmHRuAAXFfkF5ZeVLtzzF742KAu1B6FXRH/ehKuD+M8lzO0e37BsoKY4UOjuoYAVEXHcdPb06Yuv6Gxm0NLkEo2bXzxHbD1CtoXnCUiMAEnqORMzK+njmDw6citCPOFmzF/Fwb4QqF0Y0HxlH9iX12rUQGkrivy4THP2I/ZekhUWr1zcHQdYZf2f74mzMROvQaqlHf2ZikdMvWdhSByMWCAPzOJaTgWQjdvgE7cECODODoRoa4bZ0Cx1b8kXjwK2NSyWRCTqhEWKFbiRMaTDsi+sgNv3SrolwiVP4+FfTOdipmpbA9/1fCblIGZvpjM+mrgyj+V0QN+sVykbTu7KALFDe0il8UDMAmD1X8DUGr5RGgOyz8WN1pmdbHnAQPwRNaXEHfcLGDzrwwJNW5H9O9A4e3XZFkzkAUDxpP1mFDMsXrMrGd7H8ZXR2dubMoaFXTOGjM6r7gEOisxqL9hsc4ln5DV58AocctDhWFCrgUl5z1w/vGWuVmACxTU5h8KU0JCHn4wRFsCFDmOmgfhcsUyOo9h5n0LQAUyonuRJKQzxtmWFMRFQek+fcuVjWrma3LomlzDqowcrSfreMx/TDgFlz83IsiUv3tEbuegbBLeFuTm4G4bKpriBcTXxzFiG4uisvMghE/4WRKEHJdjHkBJmlIlpePlalE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S1NbulMmHpuLV/KMD/abs2PT4kW2cqvNo40+VjMr3e2gYyWQE4s6ZhhoVzBNvHr6Ct4gi84pyeD3VFCaALljNe0CjCDWMHI6M0d7VvfrBUq696r7IcUJymBBJPHZ9cetGQNaXdrN041ZImThYJPb3Tp3Jesg+lj7Szu1FdDHaEMaZN1iPemltUfI6Hhf9W3Z1CB6T0t9zgJDAvWkp+liXLL4oH1E9d/XO8jzvwLOtq+6QcKAZKjXmcL+RK0sHLx80Tv7/CXLUsffCT5SUTuGrbpowkQsGDZIQSo8UM2EnCvN+EJsc4sNMb282wjZMPVGPoKAUrPGqPKRZ+TOnGEmMRkuvSrMwHx839YU9hPNwHNplXQqR5m6v1ur/EGpvTlyJGRbx6+oxcJ6hl5Ph+YVPb0JdufL2vE4sRwXhgSX9QHLi/K0pAkyTIli2SHNVNY9JwlV4Qxqf+7056IdtGKHnZ+wzdlDdS8tVroz5Pwt0EOwZgZCNCbjlrC2yr8FqO/Oeh2zdQDGxSgv3M/i2giGVqAV4Coa7VDCV4mZujZVg+YlAnaOCKwrAmScc5NfgmfU+XHxPtD1XNP6lmG2EKbnsePQPGQtJm2f5r/AWkgRV2/Dvn+2ranVrhfAfY6odZ1NZ3d6z+EUHKWP6kxt4G6+nh12hloGz/IWoSXUbP0ShFy4muieuFJgK3JI6UIk0Sma X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DC0ZCIqjWIqdt0z5KObY4XpoNKrEqxMevYomsiD9nvAsL3k1GAO9lFIhvITRMSVZBfnzFSgFae0W4cWi1Z4Smapt0GTykwDU1ffUOvgCheIR9eEQ13cAjKdXJwg1bSm1ET2dhTNyBKNwJ1x99Bael+5ASp9nWSb6pqQsOCBR4hlTmvOeO4XzVCrDoSjrPUKATKYX52AuxWMiAG9BNscdiuqB/DL4ukId/UK42mKxcttmG43lkJI1t7zEv2KNGH1cVLsrAHuQiU/l0UYqwHCTg6CYb4ZjVxlJ5sRvWjAPHSZxe9IYobLXS8VVQB1XW0Ip58RzOLKq79LA77e8xslhOl1kAS/nNv1qLWBORuD61mgMFng5oGh7VklPHFy4HUkDo9xRXfH+x7kLt9JcxkRefHhdXg5LS/dXr3nSMT+hKE3O2gku3p32QELbMkaVF8Oo6x+suoIPgHOUjxbKH2IQAZhml97rU72iTPmGpIpOSWh9QQ6Jg7u17LqRajKdyO5CYhQytp5x0PXlT/tom3cRjdWDzTamKex0jEmDqhv+1/exWqgOtPZMl+JfUPaBzXMJzS4sIdQCyaRgkw+KpMGrAsOiU1wltTwlDMVE0B6B64BEv9ReGqxwripeoGxdJuJA80E8PvmTSE4YQX25O+Rpuy0qKN6BahO98HMMGhxlBsF/msfLitJvShrIiS+lq9Sy7G2Bih2fq5fd52YQ1prOQR2SN+GCuQt7dhulAWfEeWspK4JbjpTifDySqQxo9XCtJORCsk1UUhjvNu3GmsqEqHEpBCsSDOek9xRoP5WUDfOZhkZd/OQXMGsBSF4THRwLGgWcULeLFuGvxjD++wSJrCc7gWLXA6zG2Ima/VBZb0m8uUcMmNvfEy6FwsBA87zvrqmm2ub3KA5JqdTdzDu0iss1e1a3wUxmdO+EDsXvJYjUzD+4xqm9lwNDs39fCDfkNkOrLbJ/elpIB7JBYSKmWNRgMgM4bwPGPQcDw9eJwFb30n75PbvptSIi0KMXBwoIPg0jOlJWDIqnnsz8+Ac8U6+jjzjqWDigiBrSGGgb3BgZ9ZQzBrxghx99R5twyEv5t+5/axR7QhM8TGDFFFFwITDKkqCe8Y1hxCYnmkpG/xP9iDk6QRAxIaXrTkqLn/ZOBzCLQwxWCzX+/eKdqnxEdOoPdXV9bnQO6Y4sP8L4+WEvHESG5utCpJgeCUSs4nAuz00XGyPZzcWjRSCZtBm0EVyqKW2yqp8ilz5CRYPeyYhlDG5MYQJjFLPICOYGgWWGpdSG4d2acag4GaG4SDHJVqpqvNUf669d7wAu0EOzEZ1Q4XicN2jPw9aVSjECIhSw X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85e83419-8775-47b5-62a7-08dab10d19cb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:31:45.3983 (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: DB4P250MB1005 Subject: [FFmpeg-devel] [PATCH 6/8] avcodec/metasound: Remove always-false checks 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: Y4rzr68Rq/dI The number of channels that is checked here is automatically valid because it has just been set by us (based upon an entry in codec_props). Signed-off-by: Andreas Rheinhardt --- libavcodec/metasound.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index c81337645c..6c4525c910 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -302,11 +302,6 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx) props++; } - if (channels <= 0 || channels > TWINVQ_CHANNELS_MAX) { - av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %i\n", - channels); - return AVERROR_INVALIDDATA; - } av_channel_layout_uninit(&avctx->ch_layout); av_channel_layout_default(&avctx->ch_layout, channels);