From patchwork Sat Sep 24 22:41:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Kauffmann X-Patchwork-Id: 38216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1357843pzh; Sat, 24 Sep 2022 15:41:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5H9aF65cfljN4/Ceb1LAZEXusFKghY5olPNKV2/fXhLczuTPIXkCaKH85O4y0zaPuGq8KT X-Received: by 2002:aa7:c617:0:b0:457:2d14:dc5e with SMTP id h23-20020aa7c617000000b004572d14dc5emr214951edq.408.1664059304172; Sat, 24 Sep 2022 15:41:44 -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 r9-20020a1709063d6900b0077f4a46a179si8781652ejf.454.2022.09.24.15.41.42; Sat, 24 Sep 2022 15:41:44 -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=@hotmail.com header.s=selector1 header.b=jDgZ94lV; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2683C68B8CF; Sun, 25 Sep 2022 01:41:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065035.outbound.protection.outlook.com [40.92.65.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D64C168B3B2 for ; Sun, 25 Sep 2022 01:41:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ExGfkLJ0268w5rAsJhfvx1h2hK00uekEr4HfYRR1uF1KXSLQZ6DmmMfTTVs/8L0eZIwFI9bpIanCuYjAc+BVmJgfZf4vqDjkDHyWoq92I2bFzW/lwQEW6Oz/iMJzSm8FXVZx+J5roMy5saxgt4z0wWC5GsIvvJ7leyRwJ4l9TjYOAkS2KOHe9Okmtm9xi6qofHQ2BZyy+fJubn4cT/uYfRcOICtDbyo8Tp2UOeQBY+mcXmNuDJh3iphT6b2jYG2dZSCHPf0xhevhmfUB8pzinsA70DW4ZXWPdK9zcSGy7UpYM+wnr1/TPpU2PCQCqBvhVXnwvr/q2E7twnp1ZNPd8g== 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=iKa0l4SvMIIdPyXbeGxr8jzCAAvfj09JLBBQqb9wgx4=; b=FOkcG2AsuCLRsgp07q7CYsMeX7gdL7N24bcjTzAiJyQ/Cl1EAOnZI8um9NEn6LSu58vWbepf77zjz774nKrbWreP8LyVJdKMmfOW5pAbQ40IuDBY2AuvrYk1/4mCTKLq9OdFJeLN/xmWrbzm7C0oXuQv6vrPDsztdDCBcTXFQgZPFBndCI4Xo+j5+JIOpAQb7F1s7Q2h1Mz2IwJ480y+vZsKO9aXImBEwaATr5QMYQnzIEPbtZyjVMszoxhZP5TsY1xZANMTmx1BkQs7nGTqT2GuRAaH7phVTkrUZm0Lp88c4bIsagocw4OuJy07kZL+MHj2R/i0CV4jK/6w0M/m7Q== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iKa0l4SvMIIdPyXbeGxr8jzCAAvfj09JLBBQqb9wgx4=; b=jDgZ94lVZFKO5KP4cEGCJM7nHmBjKoNnFH1WudQtCmoo0verAPoA2oQmIqnE9c4R9SSpu1hp9Jw9ydmLFgU7U7HsI+Bni+GMwNbbXfXzscG4OgjUdgKwDk2DsVBfQc6wckej4Cr8C8rP/lRZYZIcXW8zqbx8NJcyzjRQvn67mgt7ERQF5eGQgn20K7yzfUvWK+FjfI/5SLdlCGYwG3v3EGOUInMwN2g5aZEkQ5yqnqOcF1dny6FA2Al7ODi1RRquJUedeyjKTc3+huRjX7HoF3jlCVKJK+TBnwndd/eiYGyOFx3Mu9XpeNHA2g88a4t6QFPwv63wPhrbDOiGvx3Lqg== Received: from DB6PR07MB3175.eurprd07.prod.outlook.com (2603:10a6:6:1d::12) by AM8PR07MB7394.eurprd07.prod.outlook.com (2603:10a6:20b:242::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.13; Sat, 24 Sep 2022 22:41:30 +0000 Received: from DB6PR07MB3175.eurprd07.prod.outlook.com ([fe80::2148:bb90:2e67:dd23]) by DB6PR07MB3175.eurprd07.prod.outlook.com ([fe80::2148:bb90:2e67:dd23%6]) with mapi id 15.20.5676.011; Sat, 24 Sep 2022 22:41:30 +0000 From: Johannes Kauffmann To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2022 00:41:18 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [VSmYiZYDTOTh6ukvqw0TLqwoXrSIZteL] X-ClientProxiedBy: AS4P192CA0021.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:5e1::15) To DB6PR07MB3175.eurprd07.prod.outlook.com (2603:10a6:6:1d::12) X-Microsoft-Original-Message-ID: <20220924224118.17439-1-johanneskauffmann@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB6PR07MB3175:EE_|AM8PR07MB7394:EE_ X-MS-Office365-Filtering-Correlation-Id: 50ba91b6-b0b7-4b8d-59dd-08da9e7dec86 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmoiyiq1W/GNGQnL47qJlR4RlxNu3n7wR2EP+bYzz9dU2EMCTwXzp+5VLTPIS/u3PwjHJRbExMkNt1l1U34SIdknrDKD8LyZHLecHaVWsp+DyR439Sm9qhfqbpQV7GYwBC87FjAqUytuYiPcxD0WqQy7Oumv0J6XOiKsfwF8WEdHP/KJ3G9o3pkrBXPkrbzxYqjBjQV72KfkVR9XLXxUdQw2j/S5v1B9BEHUVp4MSQrqM4+INWmY6S0u5gKifG6Ju2qy3DvwH5PpYDPwtaI9KuZJNmta9oC9xMtrij3/Vz2zMENEwRW4vfNFsXlMPnl4ZzVF6MVi05iwzMbWYYgMcWMJBQ5deeRkEnHmUbS7rBdVqPFT3+m/kZAsB0PPjdP3DD9y9c6KMMO/llYm4CPMEagQil8efaMl7n5A6n76SXWXZjASqtyT3HyaILcJxyiM5gvj7aWFcptGK02wD1XG3TV2Nw78oncz4/Wdn01mYJ825wRhWtUCH9yhJl0jeDah0URwlJ5/pigQZtUNsMuEt6tUglxkLnxVHkn+xOE8UpKALru/Z7F7Lmegg0GoWE9oRgsFUdJFE68j98Stlk6d6nP2kj7rjH7+FfbeyXXNT5lAxBxgosIJu4RIgEHrRGc8LH4KuFlVaJAB87VONVDeMJN8I8JvKlvMpIrMiOEClLrx3uEZ2UA8XSrdcJUDen1Q0qGSigDPgFqDLiDCwyHiBDAmmpdmep/HPAScTYC0oHA6YpoUx3fwOQq4aqhAAPdnIbw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JykNuYumsBUaWInkaNEDhIu8lzFZQ6QsMQMuXaHxHn25Omxd02oVN1AxjsSmp28TRuECIGzNNHjGzIO/8FxAX3ce6RJNt73tN+OQulRksCuSmy7ZMHPlTMe+7XZgeZ8TFTpnY7Yktm6oiQTaA19TpBdRSkweJi3iKKF7WH5J1mpseNsi592CibpC0Y26iboUgWL00XSsw7WvxhDfQ21n+ydf7935U9vp4L6nuZJTLW8dFRdu0ODlpqUFG/0WF3FV/9TJ0ojjT8oKHpdJUGBdvp8M1MEmTlDs4tsB3s7+4TLICgqC5g/5NskTk0eVO5Ow+dSOpWOs9uHXdGoWgIL0f/AkdtovbETl9qg0SW7wPtR9OAkxz0MgEobvpxnBqlXlVe80N0rsknnqkfrQo1Pmy4W6t5SoHbcK33OR+Zpm0YX6F1guPa5YQgiRO3R3ZQrymWgRdlBpifMod3lq+USUZizhRgwjwaCxdjK/E3Tz/LdFm2oVcb266usJBCoS9TKHWM/n0G6xCDZm31Fw7NhfpQqVDAn+neBPQhe6S1MfajCjyotM5nLmsZ3BHHtHtMqn9BBcQ44jFuZYtpxWrxh23/sVt68MK1DswjCHvEavhJgYBaL1tqNBUiTHvkn+8TQDMJwY2+qt2NkIJ5DVvEbjpw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fb96AVD9YVzwknXSsdl/2h9eH8xm0zcxtt+JseUr60Yh7OGnaAmPxM6D0F4nYeUECmRAkNt2rtt9SYj9UmVvIpf7gYTfFcSsOoK8mgpRoAlifDT8iKondxD+Ztsr09Qxn+Hhx/uY4xbbiJiL9HwGSN4IBbPXNMERF6Ae+Srypo0xr88DjwzJFPot2pE650Acgv0VWnTD8o4vbb5W7p3gNQKz9vTGt2tIygb3LxUaE/IaCtCiiDWp9hpRXUYWFV6ic8kDOWkq4vTmLiZWdDpImPsgzQkeMWeum8K5Vyq17KIZn9mNYZ30fQ4DVqAy6Bx4ejGF2rhakAYbqDAzhz7d5mAKSDIcio1ZKhfnntOnUs7jpE78ewZSQ5L4KHAk3LMQ2afOdkavx9kaq1XuTQmZHkmkuqNXLVsLVeb9eHTBKkEwZyd/DlgS2+UfzWNoQDATVnF60L/8bXaR7sZfJjMjKz8ajl6GYzhTOsqMBpaPaHoMGupv9Aw7aM1Sdp5HrEQLlhDXEDVmyncuzIbaUSv8+TssnSK87kc/eRQeAvZIacgRWSdlRvRNZ9pCQsatM63t5QLVbodBUiqBeOJ8U0JNalILLtXThha7zr0lUWJUqikUJu1pfnejuu8RIfbZafZVY7Pb6R0Rejvm+xhKsfQyDACNok/A8TwPvh8L3mePAXRFGacBRX+qlvJ7RyZu+3eMbUjNwn7FtQYKF6Pb5TpOWSDhP6sgOWRyLwaWO22YhC3xNQ5Yr8Q7AP7CsvL7bCAKwSuWOBSxk7y3jq13q2xB1fcMATpstNG/2WF2yMZ5aw4B+7rxwnjKKRLq7EtmNifpLBrlKb/ys0xjpHbINJpkXKFqXH8ucKWk7uAnioGnDTOYziNCcPT/bELBPOvAQZoKq6aiWkX0BSGPrZ7j/d+oDPco6WdBPsdtBABcU2ciIkREn39SpwKoE4utHkTriHEeh1/YAIWy8fFJcXAOy0cJqVjvD4LZByZmcMP6/AWXsQqRWM4lvQdjZbLdqbNJn2lLym13bX0HMxRgGufKQhpBQvfdNEmzkcokfvb9j6bdkMQRXqoFMVpWMn9byhuIVk+il/WFPvA+VvGra4UjmgwW/dW5TZl7wfYoimEwkcqVSWxQ/g1angU5SDI5MwVEq0TCTXeTpgWkexV9hW0hG9H9eIqYgF9ey+u/IoH4pDttZFsLrnIXz69HUwuaaVxbZw0OZovXVbZtVkgi3MbucBcSS65HHk1oR1ds5CIcZlUMw2ByHGdZMFtsDQkbKdFHI/0OQHW30AvzV+llNlk5tmTIfUsDzcGjb1YEGQEdWuNzeNI= X-OriginatorOrg: sct-15-20-4778-2-msonline-outlook-1105a.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 50ba91b6-b0b7-4b8d-59dd-08da9e7dec86 X-MS-Exchange-CrossTenant-AuthSource: DB6PR07MB3175.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2022 22:41:30.5018 (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: AM8PR07MB7394 Subject: [FFmpeg-devel] [PATCH] fixed_dsp: add missing av_restrict qualifiers 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: Johannes Kauffmann Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fAYP0dHu4FB0 The butterflies_fixed function pointer declaration specifies av_restrict for the first two pointer arguments. So the corresponding function definitions should honor this declaration. MSVC emits warning C4113 for this. --- libavutil/fixed_dsp.c | 2 +- libavutil/x86/fixed_dsp_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c index 154f3bc2d3..30eaa94bb7 100644 --- a/libavutil/fixed_dsp.c +++ b/libavutil/fixed_dsp.c @@ -135,7 +135,7 @@ static int scalarproduct_fixed_c(const int *v1, const int *v2, int len) return (int)(p >> 31); } -static void butterflies_fixed_c(int *v1s, int *v2, int len) +static void butterflies_fixed_c(int *av_restrict v1s, int *av_restrict v2, int len) { int i; unsigned int *v1 = v1s; diff --git a/libavutil/x86/fixed_dsp_init.c b/libavutil/x86/fixed_dsp_init.c index 303a2eb922..d3f4b2e325 100644 --- a/libavutil/x86/fixed_dsp_init.c +++ b/libavutil/x86/fixed_dsp_init.c @@ -23,7 +23,7 @@ #include "libavutil/fixed_dsp.h" #include "cpu.h" -void ff_butterflies_fixed_sse2(int *src0, int *src1, int len); +void ff_butterflies_fixed_sse2(int *av_restrict src0, int *av_restrict src1, int len); av_cold void ff_fixed_dsp_init_x86(AVFixedDSPContext *fdsp) {