From patchwork Tue Nov 30 11:31:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31842 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7509072iob; Tue, 30 Nov 2021 03:31:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5z+doNpONWZ275NL9kvVBN5LXZnRp0IUl85CQ2qxwI1bZ+VjdCZeDEmF3G43JCFFLq3iG X-Received: by 2002:a17:907:94c7:: with SMTP id dn7mr21973004ejc.470.1638271883151; Tue, 30 Nov 2021 03:31:23 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd5si35123713ejc.103.2021.11.30.03.31.22; Tue, 30 Nov 2021 03:31:23 -0800 (PST) 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=UrnNBpM6; 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 B09C6689F94; Tue, 30 Nov 2021 13:31:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2040.outbound.protection.outlook.com [40.92.89.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9B326803E3 for ; Tue, 30 Nov 2021 13:31:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bQpq0RsqIyDXNsvFBNzpwPViYWVeXGtOMHfOEMSEkxDFDwwsdUC6gF9Bd3uc9HzsUc+8+AFmR1SARqyvC9d2GO6cYQAoO5g/473/BBEqVHf0cZe7s/6v9AINz2QA7Exh4sQB3MMtgcCWUX2wyDr7oN6/L4LOcsn8+HO0orKeaik8NCpP9oFJFS8HLI9CwdnP+pjMRBdaXxLLlroe8HFnniIfkxhyg5HIbeqosj8ekDXpQdraowIvN8EIK3HY4z83KtTmQGqu755Qnj4khV70S5pUfTymfyAELgLPi67jYgCWKsKdLCZ0LAuZBL4HzO8nR6xv4uZ4vDvFm8/1TF3EtQ== 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=uuNzqhAqbrP/NZZ+OsaagKIlj+//Rjd28Ebwf9dEBKk=; b=GQ/bPrnw+l292m1Nl4aRB8PeshZ/Weppp5bZwbCKDmfngCjET3Q3VLvNdBSw9PZRT08bbIJDWrT7z8szb4ICqvTVcpOx/d+6pb+cqBaEZiuhcbuc6TEfSG2Ggy/lvKiQKc38fSMiikheNkgJpUASq+dEruXrIlZ69DybwfgRucUahpF744NKudfsKl2r1iisQVpWSoLRSc/6hl77FejRyxgdTnRtj/ChmOUXjHP5rr7CNVop9mPWpoeKhHP5X75bWfiQBVjLAZpW9pPCBUK4028lg3VYPetMiM3nitW9jjzan3lcg6Ie0HEDht30RDeybWPdb6xoMnvzF82jMuRWAA== 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=uuNzqhAqbrP/NZZ+OsaagKIlj+//Rjd28Ebwf9dEBKk=; b=UrnNBpM6gTBqyxcPl0NlLZis5sLaB8GWVaiMsPFeQj8mkLVleYGD5KFn5hHN8UtO2nZsbVDKqyaMAOJcrzbyC1eQNQf+RlM3BzQqNsMyGaIi/GLdE2dV61RsUaJdmNfTnLRZQv9lgVFa5CLqtwKAibJ+bXJkYTs85GCDTum+wPlWTprGV3OW3T1QQV2uWBSg8euunuO2kE3yHyUUWNoAabBF2tnZwdLQEgwxIIBdlW0fJAvgKacDWd0bAMykDq+ZVV28XMwcBt/k2rRoo7ydQ42hyeO1Y692XH+a61aqBIyxiEAxZnPvgiWlJrAax6SCJvDUht3YP0lJcDKPxHlLGw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3239.eurprd03.prod.outlook.com (2603:10a6:209:1c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 11:31:12 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.024; Tue, 30 Nov 2021 11:31:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 12:31:05 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [Hyi37Upn1N/soJ8CQLEUvVr0RjjdBKkP] X-ClientProxiedBy: AM6P192CA0014.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:83::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130113105.225536-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM6P192CA0014.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:83::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Tue, 30 Nov 2021 11:31:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bdd2b363-de42-4da3-39f0-08d9b3f4e9bc X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ7g5p8v69jsJ1AbrZo25YYcMoIg4GgegaY7PDzYiU+JDSARZW86goOkNW6yfzX5Y36vDz7RVjp8XY/JngZ6L9zf4U55FUrdIvxMITi6NQnDGlhXy0MTZ4hnXPPAowt/I5zl4jFVKLnqhXvITDtAJTrvfU3gxMLh84pxZ3SpjPGFEpSi/qV1Uk+U0+rKUHtO/kdg2STbeUKPK442OMzCzqn7QYa7bFEd80B3Qp0vOZ2/BV0rQXXo9S8ZnDh61bIp6a0BCAoNG3RncAVf1Mkz2w1pld9kak0qnkixcJCuutd3htXhXu/IppenssHjDYyGcgEiVyU2gzz65TeCLajBtBcybfQayaTI0H5KvuXReGYrYscdJGyhdInWmB5lBxgeamhMwh1Tu5fzmYTkj99xyFIkntTsDw+HOWxLhWmTSa2ICWjjOKHCavfmTY2hu92fWrHqGlxZXMhxUr4aRWsOkj8KQHhOg3MSiCrrGDmggFofY6RQc2YhJ0IFiGsIa/YwyhWOyx/koiV237eA3jI4eo+N8soxdCjaU3SPEwVXMUPyS4tXogFeDifv1T7ROnxpH4YVUu3y0L5HgrsVfwoqZ8hsdyFBsH7hs/EKjnxvxzVhkgwTHWBZmjSvtpLq9I5UZtIbxlrHXXIdTSB8TFibW6wrkQcLpBMxomSQLG64UcGXexcAcBnW4WC0Ua+4vovBrvvQ5hrgZzfpM6m5tMF5Rdtg9pLsVvhqFcYxaj6S1QB+VnJbsyDR/arLFYnnk7ZMEk= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3239: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: imhr9Zq+YniUAuw16EEENwPEl05CWI92UIVF1zr/tV4OH57IR5HDfNFnZQg9EW00lpeuMjs3cp4NTPN4S6G4TH+Iggsp3jIDwW3Fo5qrQEVc+/j7px3nb7Mz6X0gI6z9+O2ET1fghlbNXlyDv0vsdCZv+UeFY9/M0xII5Cjqt2JlWfMyhvA5g622td5u/xlqFZ09lXptiFpBzcT6bYbXSIeLuYAEnj6XRS7r76EYKet9demyjIXBnG474dhRPrrsrY1U55EFiiZfnJtSWK0k3caFaoYyN8zuOhmC6Zicde9245CbV9M+YsrnmOhn49DdWP/e9SyDnPXLdFz4l8ugGfD9xuRWy7ebcUovheE5e1UTJLdXvjUUrKb1bDyxtmvPNmyVUSjINByX64RBXave8dkU21GL8ZTl9PhblqITn7jgd8yBamXgK4HaMUo3dRJEEB0OP3sPlN0KuIL0hnDBClIpydXPQfBAVNwRVU0Snbk8D0yHGqFf64usC/zM0iju01WSIgIb1fnjzu8vNaf8B2JVwhjjvsPxzwrnURrXFJjx6KA5NyW7WxQMD+lgjHlfJLL89rrm28nhbhXQ8uzM2g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FnyfLqXTirDir+CLj+5o3Q2EuE7GSpkJKBYQJ95jv8W/x3b+9sVPzYCn0bNmkcqpYJQUS551Y83LD3B3ZWpjJVoLOLUYapm99ryxZnONBh0+fblGcqPkbMUTNqyim3Vn/XcQNZI7oCgUbwpsnXuTA5pZ2JY/DnXN5M4nDTvqO4zPKEEW+nTRjFFJYWYcXpTQhpkSG/bBSdyYwfhRVTVRL2cK5K/4niPXI71/BrZzE9yb2DKLSJ+BguIrDtRQ6Dx7ux2Upftr2kEQwoNaNvwhNIXSKYhGMv3KkG0tO4bjsc/H2YhuKnnp5gm13XbiRKZNzMnFqKiuVz2MX+Yp2oWL8lWZITaVSwpNEiY634nh1AeNRUBYJ6Bffnoemw58Jx1k0u3hAMDiULOQ79wwxE642dt3IMen7whWlPPRbUhciJQ65s6oZCwpmmA+JtSsHTmSoLKg1jC6/FmTsZgO3in+Up/Gs173O3p2wbEqBxi52qD6EkJyT6xrt1ba6yI8MpVkhmO+JCfZhuhEfK6QewxutotPSwEKkR2AyIE2HUonoE2k1IDuQ5ZlZCRyvjJK8/c3RBxxM1BZX6rJi7Q9Kpd9nNyB+wRoOGNqmkZl5WxRJR7ljWmSsmYP7J4g18J41ql2ePNpKWtVmALkdJvfqY34+Iw5OgDlxREosDSPYhPCZ/DAXKprBrViFzwnXGqqhwfZB7r5tWijdoXfFQIJMDPAzGPceJjKCerlRYIoJpUeV9wM64AZmB7oRgAFlq333YEXuuTcwRqyCM1llfusn33HJvddCPtLB77VmNlG8XGraxzfxjZ0RyakWjoDVuBYAkRgC6WEijztOVMPO/E1QkXmb+Jli+/azANRd7jBE1M3Zk3e/f717DcnOGuxhMgCW+Yszd7pRgLOjgHbRDQwfhEHZRbQ/37Qq5L6wkzJqbHPEkLLrjTAaUVGGL6EpHDifFb2rl6t+Lb+aSlVw9labUv8hA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdd2b363-de42-4da3-39f0-08d9b3f4e9bc X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 11:31:12.6525 (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: AM6PR0302MB3239 Subject: [FFmpeg-devel] [PATCH] swresample/swresample: Remove array size hint from swr_convert() 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: GRq88YWs54As SWR_CH_MAX is internal only and the arrays are therefore not required to have that many elements (and they typically don't do it). So remove this potentially confusing hint. (Newer versions of GCC emit -Warray-parameter= warnings for this, because the definition with explicit size differs from the declaration (which leaves the size unspecified); this is IMO a false-positive, because definition and declaration didn't conflict, but anyway it is fixed by this commit.) Signed-off-by: Andreas Rheinhardt --- libswresample/swresample.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 22c2c33673..c03fe5528f 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -711,8 +711,10 @@ int swr_is_initialized(struct SwrContext *s) { return !!s->in_buffer.ch_count; } -int attribute_align_arg swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_count, - const uint8_t *in_arg [SWR_CH_MAX], int in_count){ +int attribute_align_arg swr_convert(struct SwrContext *s, + uint8_t **out_arg, int out_count, + const uint8_t **in_arg, int in_count) +{ AudioData * in= &s->in; AudioData *out= &s->out; int av_unused max_output;