From patchwork Sun Jul 16 12:39:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: psykose X-Patchwork-Id: 42760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4813826pzb; Sun, 16 Jul 2023 05:40:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlEfFgEr6f5d5ejS5zqLPMPozWYthcAEGLNA11YY7VcX1mrlsJoTBE+zJcUJuuGD3lRGzR9b X-Received: by 2002:a05:6402:12d9:b0:51d:a94b:f8f2 with SMTP id k25-20020a05640212d900b0051da94bf8f2mr10196277edx.2.1689511226507; Sun, 16 Jul 2023 05:40:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689511226; cv=none; d=google.com; s=arc-20160816; b=lDCokUDYpX8oxrzxQ96R6k7O5nctJHzamwwjwXSOzEzwiDpKfWO52hIOwGqz5m0h45 kJNMNWBYZqX519sGApNx1BL17uNKLbGwL65OuEEvA6939zspbAVIZxbOS1GBTBJDt8Bw UtoZ85/B7vGoKzriiPHD4LwJ1DvvfFyFzJiQ6GKgu16w6PGHZwCL8pcyuAZteLNsKxPH GqT0EXrUYXPMhF17kwGe3rkc6cbq9RdbD9puIOroHTSD8T18tcoiMW6zWC/P+sw6CiMN WuUHXY4xcCYHnu0R6nzYMczKaOBkGOo09yuOkL7yzUPkDEijCX4k1S8Nna8fHIZwSbJy 6VmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=DqDTYjvLrewO9f680Ay6/bpnT5yCr/uO+rFaLTiY60o=; fh=36xZJ76xAFBSYO/7g8XxLvmLzl4LNfPfF/RB1fn6XJI=; b=jmLAdrGPtffE3FS2loGHnHJbOEcidq5m2jJVfRyeQ/J2Sxc3e6QZkYy+wnn17Rzqm0 BFd5GUx+8GJEQKFGwChwdReb3ASO+Ugq0oD6GFIabRXivVIHjxXf4GCmnnaJhJZcFM3K AYfdGYSKEXnRMicH0CD1pNgX5FbVZMBHLjfaxNbwno85Dy+9/9Fg5cpcMu4M1IPUpRy0 WvtWK6PdLyGH6oCxcnzObM14OhVYhbhpa1feRCsycxA8VZqjq/iGMi9ZrV10CWCr1Odv vj+CmFsxokWQQoRl7zmBJsKA0L95v9+DmPDGv0XuifRmMH5axXJI0jm+8J3F3OIi2/lR Mf4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ptrc.gay header.s=default header.b=SnEiDtOo; 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=ptrc.gay Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h14-20020a50ed8e000000b0051e2819d4a1si12326808edr.543.2023.07.16.05.40.25; Sun, 16 Jul 2023 05:40:26 -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=@ptrc.gay header.s=default header.b=SnEiDtOo; 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=ptrc.gay Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA5C668C571; Sun, 16 Jul 2023 15:40:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.torastian.com (mail.torastian.com [49.12.213.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8034268C4C7 for ; Sun, 16 Jul 2023 15:40:14 +0300 (EEST) DKIM-Signature: a=rsa-sha256; bh=exvA/YiDIbFQFJJrMN5XNg4I2SV7/stS1EapCNoYAww=; c=relaxed/relaxed; d=ptrc.gay; h=Subject:Subject:Sender:To:To:Cc:Cc:From:From:Date:Date:MIME-Version:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-Transfer-Encoding:Reply-To:In-Reply-To:Message-Id:Message-Id:References:Autocrypt:Openpgp; i=@ptrc.gay; s=default; t=1689511213; v=1; x=1689943213; b=SnEiDtOoYHxuyURlWNQkrdyGafTHisc1efTONtHHuChfLUmUDA11SxfI+1eVw9qKnQ09rlPc SHVwtO4KqsNfSASROKFrfqkTcFW3+6g0hEUfLFODxZ6uAoidIYqjGfRCusw3X0x/hCLz1Pnh4JQ EB0AjdqskbgeZnj1Z0yk6xEORJV+hmOwXk8hEfIdI8b69EL/1SEsvqntRFoyZhTZClxZpEKZS0O 3m5FUfXwSxuuyPs3gwlz7SK52LEk8X2TMSx4mfhAmOuJJAYIy8HHAtFZ4Q+6sdwSdPbvCDAbPYk p2NFQZLJ/za60DJqLAJN7uwdh1WpG5pIGDF1OhXhPjazg== Received: by mail.torastian.com (envelope-sender ) with ESMTPS id acb38539; Sun, 16 Jul 2023 12:40:13 +0000 From: psykose To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 14:39:45 +0200 Message-ID: <20230716123946.4813-1-alice@ptrc.gay> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] swscale/x86/rgb2rgb: fix a Wlto-type-mismatch warning 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: psykose Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OUc7NbSzopZk From: psykose fixes a warning when building with --enable-lto: libswscale/x86/swscale.c:323:1: warning: type of 'ff_nv12ToUV_avx' does not match original declaration [-Wlto-type-mismatch] 323 | INPUT_FUNCS(avx); | ^ libswscale/x86/rgb2rgb_template.c:1821:6: note: type mismatch in parameter 8 1821 | void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV, | ^ libswscale/x86/rgb2rgb_template.c:1821:6: note: 'ff_nv12ToUV_avx' was previously declared here this is because INPUT_UV_FUNC in swscale.c has an 8th void * parameter, so match the declaration and pass NULL for it --- libswscale/x86/rgb2rgb_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index 4aba25dd51..f6c843e4f2 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1823,7 +1823,7 @@ void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1, const uint8_t *src2, int w, - uint32_t *unused2); + uint32_t *unused2, void *opq); static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, int width, int height, int srcStride, int dst1Stride, int dst2Stride) @@ -1831,7 +1831,7 @@ static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t int h; for (h = 0; h < height; h++) { - RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL); + RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL, NULL); src += srcStride; dst1 += dst1Stride; dst2 += dst2Stride;