From patchwork Tue Jul 30 07:51:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 14143 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 5AEC14487FE for ; Tue, 30 Jul 2019 10:57:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A97768A641; Tue, 30 Jul 2019 10:57:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0D95680109 for ; Tue, 30 Jul 2019 10:57:23 +0300 (EEST) Received: by mail-io1-f51.google.com with SMTP id k20so126024097ios.10 for ; Tue, 30 Jul 2019 00:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bTWy/AJWfGDRKqsefeWdSLqzO/cYHKgQ6uJgiUtTDvk=; b=MRuwMXm8Pffubh3DgwKwKv3yAh4iY6ZSsY8IeG0/W8p03spkhjgLNy2F/P7qGRrbXU krX1IhHic4yhCa3pfJ9sYgtbeM1Up3EsStPCy8ZE2P7XlwW0cm9XSkwBNee/f1Fsj0ND vKO47MPJNxjdBOzCxMCS3g/sDQGsuN67Gaz1uEFp7Uo2R/kh62KVPLTAJ1aFGNgAr3D2 GfbCqSKcyRQrtz/FQZcEs1JzELW7hkX2mna/0lho8CbshwiSa1rmSz1jSlOSWOoWvQYN QZfZPfzaRzyP8e38yCew8ZxGX/W0W84LblUpu+Gl2HgoJgGO6icn2VVZnd9XizNwwRw+ JGJw== 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:mime-version:content-transfer-encoding; bh=bTWy/AJWfGDRKqsefeWdSLqzO/cYHKgQ6uJgiUtTDvk=; b=EvwjvJvYxa7kyWKaRBQ/RFr6yp10HYr/qE9xRVGJ92WW4PoVMDqM1lHi+Si3kzN7nj oL9u702viXNhKM2k729gTyIFeo94auiXJ4iZ1F+9YLmHo3Wn1HignW+L3l6z+24AfoJC OnTnHi2MOZz3p9nB4Or4RUD9fspuW7Q1Hc+YxKPzNNcKRZ9LtPq/exIBq9KpM/LgU+EW VmBH2dCElig6si1Nn+ordki09TZFWLZTr2rxp24FwxmF4YwSoHqSXsYa76kbMSOvnD7G EnGmvr4SV1BSTbbpc3y+4Tvb93+FvEGASrkRof04TegURlHGkY94yhTy4WB+gDplseQT uX9w== X-Gm-Message-State: APjAAAXYJ/YXem1VBQCL0YIi3xrC3yX2BzOyg4PLcZVzJGoxkQIR6leI RDFSKexhYPdKhAAFY6EWX/35+F+gNR0= X-Google-Smtp-Source: APXvYqwaV7eoMiWwA3iLmFkXHjyRutwP6zIEDLI9CmpR7WB/u05Ig6ql6c6iQ1Jd2Klzb+jQcn+yRw== X-Received: by 2002:a6b:7d49:: with SMTP id d9mr93638377ioq.50.1564473114314; Tue, 30 Jul 2019 00:51:54 -0700 (PDT) Received: from MacBook-Pro.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id b8sm52893199ioj.16.2019.07.30.00.51.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Jul 2019 00:51:53 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jul 2019 02:51:43 -0500 Message-Id: <20190730075143.40520-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190730075143.40520-1-rodger.combs@gmail.com> References: <20190730075143.40520-1-rodger.combs@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavfi/vf_thumbnail_cuda: fix operator precedence bug 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" Discovered via a warning when building with clang --- libavfilter/vf_thumbnail_cuda.cu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_thumbnail_cuda.cu b/libavfilter/vf_thumbnail_cuda.cu index c73e49fbc6..d4d4d791f6 100644 --- a/libavfilter/vf_thumbnail_cuda.cu +++ b/libavfilter/vf_thumbnail_cuda.cu @@ -71,7 +71,7 @@ __global__ void Thumbnail_ushort2(cudaTextureObject_t ushort2_tex, { ushort2 pixel = tex2D(ushort2_tex, x, y); atomicAdd(&histogram[(pixel.x + 128) >> 8], 1); - atomicAdd(&histogram[256 + (pixel.y + 128) >> 8], 1); + atomicAdd(&histogram[256 + ((pixel.y + 128) >> 8)], 1); } }