From patchwork Sun Jun 24 18:25:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9488 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:141:0:0:0:0:0 with SMTP id c62-v6csp3283600jad; Sun, 24 Jun 2018 11:25:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcLDptCyhf+IMB5UMVdwOdKYuCxpJ6fj5VS1DCQf3dlQvaOvNGtPMRWYRNY/VxvzyoAQy+6 X-Received: by 2002:a1c:8789:: with SMTP id j131-v6mr3395699wmd.147.1529864754358; Sun, 24 Jun 2018 11:25:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529864754; cv=none; d=google.com; s=arc-20160816; b=ChOliNXN5o+xYd2PAfy4ZKRxx4WCv3zjc5SutK21x2dm9mzbIFyCesu0xm/xe+QsJm rMcqc7m6WUSDJScpdHFhqaCkin5q0UJO2Si535Dpi2684J0zvdhDP//XUafY2/QcN50l 7AT4+rN9i2UOSfwk8e2To3NEnCAzdub59D7bXnK0l5V5VLYiTKy1LAySpLYXH57sVDNH dZ2q0hmg7XHQLqtyFuQZ1Q4Jisli907U2dA9Eap6g0NEvV7c6iY9GyNjFEX+boUH4zAc cUhIaXDIqAspNB7nY34nKZlgxNvZQ/wOkkO5oFsNxhkBlN/LrfZz9K8rYE7oF0C1x7c8 GeoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=QD1IcGaRGlV+7/9kH5POg+W8q1TYDtvFcz9npc7RNv0=; b=UYUUQs63+HbbhTWuGdGS1oWVSmYD0GbBnsnufC44M0879hml5NyU80Jf2LgMJabpoC HGi1CKX3JNYqJ5TI9PE6/UP3VMx22pkBoxzY5oZ3sIjAC6Mt7bnyQj3QmOSFe0k9Aaro WSgtSLe7mqhVjXli6vmPdR+e0PFj9HylJDh3hQ3HnpXDCpSgSja4jD9yZDL2N7huF8va geEs9q+JbNrAvZdlD4w4MeKFgQLM59pIfLtKmGCTh4QXgIsb9ibiCuNyKgcWKInKLt99 cThj65zQ0CwnOVRffp82qFjmkhLXbR1OgLtboXzGDzw2oesI7mCKCeO9I38gTI4g/i1A UHHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=FZTAQWa1; 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 f2-v6si3268891wrg.265.2018.06.24.11.25.53; Sun, 24 Jun 2018 11:25:54 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=FZTAQWa1; 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 25F86689AA1; Sun, 24 Jun 2018 21:24:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14D376882DA for ; Sun, 24 Jun 2018 21:24:50 +0300 (EEST) Received: by mail-wr0-f169.google.com with SMTP id k16-v6so11382993wro.0 for ; Sun, 24 Jun 2018 11:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=a0vQsd6zu3DspFO9JBadZAn7DtGkGceMwgfAYE/G/I4=; b=FZTAQWa18J0SpxhlJk73kr0ubJISMi9f25+icm6Z3EzdluoqlX8GuxXslox/h917h2 pDD87OHTxQxWxdG1d4fBFpO+ji3L0mBhOaaqTi9ruJsF9D7TTj0pyDyf6/BOeJQvQBMD vkDuE//+9zt2x9Vpl/6XNeY3U/TQehn8TH+N0hJk1FFf0zJkoFjxYPAV2BSbWkYPCknR QpBslgVJ/uxuWRtRvAmG6qLR30Q4sBsmB1qKpRIvVx1zrDfyYVIIJZiDL9FWcs08GGG1 c0AOxTAEjD5FWd99L4xiWWdK1tZ2QW7nw7WqstPAVivoG7hubB1D4RVVMRvnc91j1cea fApg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=a0vQsd6zu3DspFO9JBadZAn7DtGkGceMwgfAYE/G/I4=; b=fPBV/FApnlCGpyGhf1dORaEKS8zXYqt0Hhyse1lykzJG7Uc7KvPJXMYQYYnojb6orv S+rcsMXRikypQWknbj+KhbfW0LzfEC43GuSb771at6M10FQBa+GV1Dk7vX9Ag6kXL0hI pZsXpTF2ktaLMPf4WtifloXFC5x7FVRV+n8Hq8xINEG1fAKdRhpcQ3cH6vEI1/Txxn8u MSmxXA5LI34IDfa+PKKVd+RbKv8jGS+ctCWs3WCCnv7NtxQPQa00PAOShy2SQbzlnflO Tu0WcxvxFhCQhsZDT1XPJljuyPTEoLjuys/+9UBuOvZ+8gVd/3ZcaO9MVyI3JZUczQVD rhkQ== X-Gm-Message-State: APt69E0wE3vJ/Q+lJwTQy5VkakxUg6FAQf2tx2CzpyjBxZUAlaTPTB9o ali7+cTBUyEaPFHLT9CsMorJk7KD+I0= X-Received: by 2002:adf:b60d:: with SMTP id f13-v6mr7437290wre.186.1529864744590; Sun, 24 Jun 2018 11:25:44 -0700 (PDT) Received: from lehr.home ([2a00:23c5:418a:8b00:5afb:84ff:fe66:bcaf]) by smtp.gmail.com with ESMTPSA id a2-v6sm5089929wmb.6.2018.06.24.11.25.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 11:25:44 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Jun 2018 19:25:36 +0100 Message-Id: <20180624182539.32194-2-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624182539.32194-1-sw@jkqxz.net> References: <20180624182539.32194-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 2/5] lavfi/vf_tonemap_opencl: Mark local tables static 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/vf_tonemap_opencl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index b4ef7f269b..11978e64a6 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -75,22 +75,22 @@ typedef struct TonemapOpenCLContext { cl_mem util_mem; } TonemapOpenCLContext; -const char *yuv_coff[AVCOL_SPC_NB] = { +static const char *yuv_coff[AVCOL_SPC_NB] = { [AVCOL_SPC_BT709] = "rgb2yuv_bt709", [AVCOL_SPC_BT2020_NCL] = "rgb2yuv_bt2020", }; -const char *rgb_coff[AVCOL_SPC_NB] = { +static const char *rgb_coff[AVCOL_SPC_NB] = { [AVCOL_SPC_BT709] = "yuv2rgb_bt709", [AVCOL_SPC_BT2020_NCL] = "yuv2rgb_bt2020", }; -const char *linearize_funcs[AVCOL_TRC_NB] = { +static const char *linearize_funcs[AVCOL_TRC_NB] = { [AVCOL_TRC_SMPTE2084] = "eotf_st2084", [AVCOL_TRC_ARIB_STD_B67] = "inverse_oetf_hlg", }; -const char *delinearize_funcs[AVCOL_TRC_NB] = { +static const char *delinearize_funcs[AVCOL_TRC_NB] = { [AVCOL_TRC_BT709] = "inverse_eotf_bt1886", [AVCOL_TRC_BT2020_10] = "inverse_eotf_bt1886", }; @@ -100,17 +100,17 @@ static const struct LumaCoefficients luma_coefficients[AVCOL_SPC_NB] = { [AVCOL_SPC_BT2020_NCL] = { 0.2627, 0.6780, 0.0593 }, }; -struct PrimaryCoefficients primaries_table[AVCOL_PRI_NB] = { +static struct PrimaryCoefficients primaries_table[AVCOL_PRI_NB] = { [AVCOL_PRI_BT709] = { 0.640, 0.330, 0.300, 0.600, 0.150, 0.060 }, [AVCOL_PRI_BT2020] = { 0.708, 0.292, 0.170, 0.797, 0.131, 0.046 }, }; -struct WhitepointCoefficients whitepoint_table[AVCOL_PRI_NB] = { +static struct WhitepointCoefficients whitepoint_table[AVCOL_PRI_NB] = { [AVCOL_PRI_BT709] = { 0.3127, 0.3290 }, [AVCOL_PRI_BT2020] = { 0.3127, 0.3290 }, }; -const char *tonemap_func[TONEMAP_MAX] = { +static const char *tonemap_func[TONEMAP_MAX] = { [TONEMAP_NONE] = "direct", [TONEMAP_LINEAR] = "linear", [TONEMAP_GAMMA] = "gamma",