From patchwork Tue Nov 14 13:26:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alfred Wingate X-Patchwork-Id: 44656 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp1979991pzg; Tue, 14 Nov 2023 05:27:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IF5O7iTIa5KpovxopORFS5iDfTwolnOufMSE7uUd2neQfj4LIqMhoqn1jI2mMLhqCwC/YMQ X-Received: by 2002:a17:906:c28a:b0:9de:32bb:fa94 with SMTP id r10-20020a170906c28a00b009de32bbfa94mr6736801ejz.64.1699968442700; Tue, 14 Nov 2023 05:27:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699968442; cv=none; d=google.com; s=arc-20160816; b=Y0i2ko+hZBv3PNOjgUgB86fsp503kCX7GUsdfaul6+RU1vb8zLqQbrtG+Z+R1sE2LD oMf0S3b67iA0rS04j1LWeUdxczDXZ7wYRqjNyk0FdwHnKY9lWGX4dJXg+FeL3G8q3GG4 ECWCgA0ujnPshtGHvQz+0dYrs97OR8m+6i7z3HyLm6aTrEPzhy5vzb9ubfwl8qZkuMfR jgRy5Qx9bGxvLa8ggPQQYR7SQiqK53CP6hPkqeS6nabXmgGVj/fvDpUoAMhofzvrUSiG keQZhPsWVr7itV9dLyJKt1WW+cLRegUHTOSvC7DeFTdgQ6hp26Do++DvJwU/QzyGKAK3 0zHA== 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:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:feedback-id:message-id:to :date:delivered-to; bh=ZwK/V346BpCt03V+YE/fRtskku8hRlhpe6YhXQEpB9I=; fh=+MHl4oChYwUxDcQkL66EyTVrxuX/fIb87CetUAsKiVY=; b=i/utvDbe0R+gsOZU3JNvUcZt74mvuMloTWB8qM4ITF2dPzHQjVbP17CWbMs1G5yquw bxhOZjpu0H529MwWh6iBstX6/cZSROo2uHZPQHK358qXh3EXGAjsJoEMdpwSKx1nm0as jKDejTtGBWJwITiPuTIs1CGOWfbe6jlC5fjrObljj4c0WhRUkCMYwY48QY2WyeQATMZw TAjKGJaBLTJwLTqURB3PPUofH3qxWzLlw3NvSFqQxtTbep1Dm66nVyRzApFAo2gltq+J /+02PR1YBzWj4BS9s/bilW7l8PHNAm83HEHDKt+gKbgLh5DZ8hej8qWBRf8LJgm/NUYX QWiw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jr22-20020a170906a99600b0099318060d40si4123643ejb.459.2023.11.14.05.27.16; Tue, 14 Nov 2023 05:27:22 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF81068CD32; Tue, 14 Nov 2023 15:27:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40140.protonmail.ch (mail-40140.protonmail.ch [185.70.40.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B23F68CA60 for ; Tue, 14 Nov 2023 15:27:07 +0200 (EET) Date: Tue, 14 Nov 2023 13:26:47 +0000 To: ffmpeg-devel@ffmpeg.org Message-ID: <20231114132638.22948-1-parona@protonmail.com> Feedback-ID: 25092314:user:proton MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] swscale/x86/rgb_2_rgb: Add opaque pointer to missed definitions of ff_nv12ToUV 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: , X-Patchwork-Original-From: Alfred Wingate via ffmpeg-devel From: Alfred Wingate Reply-To: FFmpeg development discussions and patches Cc: Alfred Wingate Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: g5qNcGVtjQRU Opaque parameters were previously added to the original definition of ff_nv12ToUV, leading to gcc noticing a type mismatch with -Wlto-type-mismatch. https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f2de911818fbd7e73343803626b697fd0c968121 https://bugs.gentoo.org/907484 Signed-off-by: Alfred Wingate --- libswscale/x86/rgb2rgb_template.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index 4aba25dd51..edbacea784 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -1823,7 +1823,8 @@ 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 +1832,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;