From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E14D546EB4 for ; Sun, 16 Jul 2023 12:40:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9927B68C50B; Sun, 16 Jul 2023 15:40:22 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".