From patchwork Tue Feb 2 21:50:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 25351 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 961D044AB7B for ; Tue, 2 Feb 2021 23:58:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73144689E5B; Tue, 2 Feb 2021 23:58:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60EF1689A91 for ; Tue, 2 Feb 2021 23:58:22 +0200 (EET) Received: by mail-ed1-f44.google.com with SMTP id y8so9516205ede.6 for ; Tue, 02 Feb 2021 13:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=FVr6gx9J48CBQkYynM46c8bvcuA5zwT7+G6PHKm7WPQ=; b=XFP5V7oZ+Ne9oF8qnJ5LNhb7q1ILSLdy4dBZOi11e/n2locwGkBnjlTEWvGVeVawLQ EQylNjMk9c/KvRMmeDqJUVI0zIwZmY2UMpaLQbJY21ppDDGNuFEOcSWzitub9cJ+VBdP EOCvjie66pdTtEvtvCmriDNOn8fgNeu/eO0vumJIAPs6GB2I5TZyXiVyp6vLTb6PHeQN xwDCDZjdA9qcBHfGIQgaHXnbH7vK+EHp5jlqePKbaAHNsGNn2YOK0XF2ur6oXWrJBfej wjmZGzpfNVuqIs2w75CrGF7ebFp4ym6Q4rR5iJxrbj0fWgnU7CpcNOvU9P2u8/VlI0vi EbJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=FVr6gx9J48CBQkYynM46c8bvcuA5zwT7+G6PHKm7WPQ=; b=D1SDFu5XRcnxrzypZbZD/O0MHRh0Nx1i3tzKVIzoaUMdQeJ/nugH4LLFLmz96ivMmS tBhAHoaGQ7GVUXfRklhg+/ktAahQlcCj139orMuMxgGuMiwgYzUu5ja7aElMgDHGS5ep WCQJoTJVCb5RjXKSpTxB6J1h5w2C5ZIZJBJkesJSG8zVp1DM1s7FPLMZ4D+K9EDroTko op9GPxL6NBOCMd3VKxepTn5cC4lKZ7hKfEzw9GwCbLUn7EtUdSoOGeTBP6+9yiF10FjH vUQ4NjqCmut9bPgO+WJOytiM8el3pB2CiOjA9m2lcrPg+9MiMD+zaJ3KE77A/0raHT01 MEuA== X-Gm-Message-State: AOAM532G4HZAMBdX01cok5vbSRuH8HN4id/4yenm4/TSUw7MXGN0fXyy VSuyYGAmi/pw1pmFiNOT3MqBXxEQxpVAPQ== X-Google-Smtp-Source: ABdhPJyq8rgoGNoYd8Kq3d5eZ4dk+phGSGWpLaK4SDrB+Q4BTDyfnf8NmniJ+pQHpg2t3Se02+HWRA== X-Received: by 2002:a5d:4145:: with SMTP id c5mr99622wrq.353.1612302638864; Tue, 02 Feb 2021 13:50:38 -0800 (PST) Received: from [192.168.0.3] (cpc91226-cmbg18-2-0-cust7.5-4.cable.virginm.net. [82.0.29.8]) by smtp.gmail.com with ESMTPSA id q6sm32509143wrw.43.2021.02.02.13.50.37 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Feb 2021 13:50:38 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: Mark Thompson Message-ID: <24c695f9-19a4-7a0d-0172-dd76ba5ddbe5@jkqxz.net> Date: Tue, 2 Feb 2021 21:50:37 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avfilter/vf_pseudocolor: Add missing braces X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The array inside a structure needs two levels of braces. --- The previous format was unambiguous, but it provoked a lot of warning spam. gcc 10: CC libavfilter/vf_pseudocolor.o src/libavfilter/vf_pseudocolor.c:107:35: warning: missing braces around initializer [-Wmissing-braces] 107 | static const Fill spec1_fills[] = {{0.5f, 0.f, .5f}, {-1.f, -1.f, -1.f}, {1.f, 0.f, 0.f}}; | ^ | { } src/libavfilter/vf_pseudocolor.c:107:35: warning: missing braces around initializer [-Wmissing-braces] 107 | static const Fill spec1_fills[] = {{0.5f, 0.f, .5f}, {-1.f, -1.f, -1.f}, {1.f, 0.f, 0.f}}; | ^ | { } { } src/libavfilter/vf_pseudocolor.c:107:35: warning: missing braces around initializer [-Wmissing-braces] 107 | static const Fill spec1_fills[] = {{0.5f, 0.f, .5f}, {-1.f, -1.f, -1.f}, {1.f, 0.f, 0.f}}; | ^ | { } { } { } src/libavfilter/vf_pseudocolor.c:107:35: warning: missing braces around initializer [-Wmissing-braces] 107 | static const Fill spec1_fills[] = {{0.5f, 0.f, .5f}, {-1.f, -1.f, -1.f}, {1.f, 0.f, 0.f}}; | ^ | { } { } { } src/libavfilter/vf_pseudocolor.c:108:35: warning: missing braces around initializer [-Wmissing-braces] 108 | static const Fill spec2_fills[] = {{0.5f, 0.f, .5f}, {0.f, 1.f, 1.f}, {-1.f, -1.f, -1.f}, {1.f, 1.f, 0.f}, {1.f, 0.f, 0.f}}; | ^ | { } src/libavfilter/vf_pseudocolor.c:108:35: warning: missing braces around initializer [-Wmissing-braces] 108 | static const Fill spec2_fills[] = {{0.5f, 0.f, .5f}, {0.f, 1.f, 1.f}, {-1.f, -1.f, -1.f}, {1.f, 1.f, 0.f}, {1.f, 0.f, 0.f}}; | ^ | { } { } src/libavfilter/vf_pseudocolor.c:108:35: warning: missing braces around initializer [-Wmissing-braces] 108 | static const Fill spec2_fills[] = {{0.5f, 0.f, .5f}, {0.f, 1.f, 1.f}, {-1.f, -1.f, -1.f}, {1.f, 1.f, 0.f}, {1.f, 0.f, 0.f}}; | ^ | { } { } { } src/libavfilter/vf_pseudocolor.c:108:35: warning: missing braces around initializer [-Wmissing-braces] 108 | static const Fill spec2_fills[] = {{0.5f, 0.f, .5f}, {0.f, 1.f, 1.f}, {-1.f, -1.f, -1.f}, {1.f, 1.f, 0.f}, {1.f, 0.f, 0.f}}; | ^ | { } { } { } { } src/libavfilter/vf_pseudocolor.c:108:35: warning: missing braces around initializer [-Wmissing-braces] 108 | static const Fill spec2_fills[] = {{0.5f, 0.f, .5f}, {0.f, 1.f, 1.f}, {-1.f, -1.f, -1.f}, {1.f, 1.f, 0.f}, {1.f, 0.f, 0.f}}; | ^ | { } { } { } { } { } src/libavfilter/vf_pseudocolor.c:108:35: warning: missing braces around initializer [-Wmissing-braces] 108 | static const Fill spec2_fills[] = {{0.5f, 0.f, .5f}, {0.f, 1.f, 1.f}, {-1.f, -1.f, -1.f}, {1.f, 1.f, 0.f}, {1.f, 0.f, 0.f}}; | ^ | { } { } { } { } { } libavfilter/vf_pseudocolor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 192839342b..3416ab19a9 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -104,8 +104,8 @@ static const Range full_range = {0, 256}; static const Range spec1_range[] = {{0, 16}, {16, 236}, {236, 256}}; static const Range spec2_range[] = {{0, 16}, {16, 22}, {22, 226}, {226, 236}, {236, 256}}; -static const Fill spec1_fills[] = {{0.5f, 0.f, .5f}, {-1.f, -1.f, -1.f}, {1.f, 0.f, 0.f}}; -static const Fill spec2_fills[] = {{0.5f, 0.f, .5f}, {0.f, 1.f, 1.f}, {-1.f, -1.f, -1.f}, {1.f, 1.f, 0.f}, {1.f, 0.f, 0.f}}; +static const Fill spec1_fills[] = {{{0.5f, 0.f, .5f}}, {{-1.f, -1.f, -1.f}}, {{1.f, 0.f, 0.f}}}; +static const Fill spec2_fills[] = {{{0.5f, 0.f, .5f}}, {{0.f, 1.f, 1.f}}, {{-1.f, -1.f, -1.f}}, {{1.f, 1.f, 0.f}}, {{1.f, 0.f, 0.f}}}; static const Curve curves[] = {