From patchwork Fri Mar 8 08:14:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 12243 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 A6B20448499 for ; Fri, 8 Mar 2019 10:14:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 878AD68A660; Fri, 8 Mar 2019 10:14:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A085A68A660 for ; Fri, 8 Mar 2019 10:14:23 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id n74so13589643pfi.9 for ; Fri, 08 Mar 2019 00:14:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9iyQzUNVWYiDRhLeLVONEO5scUMFP0kxS7tEdtmRYWk=; b=CI00cs1ktp1P3ymv5o7GPfdMJoI729VjalDMLD0ZePZ2aWVa3tcKfWC7ENlU0NtGOP JvgVzY3tTdZ36FZyM69Y2cqDyJcBT4SEX7xRy5TTey+iQyjCbwmM2ong5SH1eFP3qp0u ISw7qV++XojPmFy2hkIk+hM0zjysppny5IGmqmunHhkpZfKOvmsCUss8GueK8K/51chh 9QqXEsADByvG103P4s2eXLfJvkQevsJNTYrYQQRP0k6H1Sl8fpTsA+6wxwSHiKVkzsAq GvDdNX/0AOFTFzggHX8ZAjAsdu/wlsOyXMwaPivJVjyy3e0yk/BQJsx6mMhpK6ob29Ua ayNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9iyQzUNVWYiDRhLeLVONEO5scUMFP0kxS7tEdtmRYWk=; b=akCsSFPJVf2QicZPICAkFAsdXc8wym+y0UNRZnh29H3sIkAiYzc4QX0bHmElgb+T/k UdHD2RbWdCGyMI31DFHs993XIA/8FWOid2gXk8CLcEM7+xR8riWfnDxB65UOKDDrcmyT kAvjsnkiMPHFxlhkhrJdr7rZrOdrvxnb0riUgvgj6oWbu5tQTZ99q268hLH6AQsW/coe 9TxrgP239TJIA2MHAWX8QwZxYKqkrBIopJ4gk5NVIpTfhYaVpDMN75dVhnChpbDXC4Mm IjgNnz1q/HsWW6FRumejpw0mo5yyObDXL9dvqkqfb66gMC6S43RopnV0ycrLeIXXza8m 6i5g== X-Gm-Message-State: APjAAAUSAXVbOMAGB63PYLuKm/5nSwkCz8CVW2ZDANok8oq1GF0Nt5VG ZyTQYYsOs1ajisvO+3ExdUBJY1si X-Google-Smtp-Source: APXvYqwqXPaGakqXI8TNtzSvLCLzx9cb9eoZ+am+/DC4WU6yBXbfEVOrNuU6bIrDy/7wRbaf6YngHQ== X-Received: by 2002:a63:7341:: with SMTP id d1mr15821742pgn.405.1552032861407; Fri, 08 Mar 2019 00:14:21 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id j14sm11044027pfn.77.2019.03.08.00.14.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 00:14:20 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2019 16:14:12 +0800 Message-Id: <1552032852-18731-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1552032852-18731-1-git-send-email-mypopydev@gmail.com> References: <1552032852-18731-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V4 2/2] lavfi/nlmeans: fix mixed declarations and code 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 Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix mixed declarations and code in C90 after last change Signed-off-by: Jun Zhao --- libavfilter/vf_nlmeans.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index 8d47f9d..7497df2 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -476,6 +476,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFilterContext *ctx = inlink->dst; NLMeansContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *out; // accumulation of 8-bits uint_8 into 32-bits data type, it will have // a risk of an integral value becoming larger than the 32-bits integer @@ -488,7 +489,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return AVERROR(EINVAL); } - AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) { av_frame_free(&in); return AVERROR(ENOMEM);