From patchwork Wed May 13 15:12:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19671 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 2934544B25E for ; Wed, 13 May 2020 18:13:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1833B68813D; Wed, 13 May 2020 18:13:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48288680ACD for ; Wed, 13 May 2020 18:13:21 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id m7so6937050plt.5 for ; Wed, 13 May 2020 08:13:21 -0700 (PDT) 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=kaymcUny1zKjdL3nVr5ltWEXNHzmUa4p6DNUv8wezBg=; b=XYx9WRrzLIavCFg7q22JY5iuZCxIGfM+QU7u5h4tVjZTA6j4/yU9ucQ1mfQa0g3iHL Y5/2zmgOxcf80kl6a8cHWBUhqkdYyUl+17KQw/qjI8lCbsSeH/20rntDI+d9pO8ZzliB NeaMM2hoUmeWcv0E5oQWU6beIqNePYoN1zR66n684jd3wErD6DPJRvuVx/N07/XPYHa2 cNCsLv9AKjVhS789Ktt6Dhv+RIhLvpZxIGwddugrWV1LSZTnayJ77l8hd1uu4Gzoxsfr qClKo+ZOlaykIjRTAP0Iz2SAWCHMki+U2ZMhFXafoPlZo9Jv2UNMbnWc7Bi+wnvlx8v6 j3Xw== 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=kaymcUny1zKjdL3nVr5ltWEXNHzmUa4p6DNUv8wezBg=; b=Rn1YdJPE/B3ctny+YGTvn33Dw9UxtLgWzYqq8DM3szpbD+MmcmREDFRfSYy7iR1Y+Y +K+T9BiGI9+JVIqE4r5IGdOoKbdQcSu5549gkLYuNIwIKDlch09XAB1kLSJdFMIoK9uk r+bTR2aXIHybtMpnitijBVcXr6KSEUTDi7/ous+E7k+44ywV3VLoNcWhU8TnuDTbCpy1 umAOWMIo2NHL+K3J5YWX569fbxT/K/3Q5RH5E8rGau6uObrkyBLzgGXPkFjDzmrX8k4z RXPrWjAdl2RLPgTuQrkH8y+vIJzbKO3oUMCQRzvdovdXXIvmVTghlrwKoBm+tLNfeCqF 0kDw== X-Gm-Message-State: AOAM533+qVjCNbFeOwAaZUiytqF2FpPu8hkYmE247MFKcEJmNuJQx8w/ Q5fAYK2cSRCrB71MQ3XvQ2IouL7v X-Google-Smtp-Source: ABdhPJyGg1U9HP5t/6JLfSgzEYf4Z8wi2l6Svn0KRAX01nYKREqd3XuvojBq9PUIL99+MICyy8Gx4g== X-Received: by 2002:a17:90a:8818:: with SMTP id s24mr4060198pjn.131.1589382799535; Wed, 13 May 2020 08:13:19 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id t64sm43309pgd.24.2020.05.13.08.13.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 May 2020 08:13:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 May 2020 23:12:42 +0800 Message-Id: <1589382763-28061-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589382763-28061-1-git-send-email-lance.lmwang@gmail.com> References: <1589382763-28061-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] avfilter/vf_libopencv: reindent after last commit 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_libopencv.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index 141d696..5899867 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -528,12 +528,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) /* facedetect filter will passthrought the input frame */ if (strcmp(s->name, "facedetect")) { - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); - } - av_frame_copy_props(out, in); + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + av_frame_copy_props(out, in); } else { out = in; } @@ -541,9 +541,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) fill_iplimage_from_frame(&inimg , in , inlink->format); if (strcmp(s->name, "facedetect")) { - fill_iplimage_from_frame(&outimg, out, inlink->format); - s->end_frame_filter(ctx, &inimg, &outimg); - fill_frame_from_iplimage(out, &outimg, inlink->format); + fill_iplimage_from_frame(&outimg, out, inlink->format); + s->end_frame_filter(ctx, &inimg, &outimg); + fill_frame_from_iplimage(out, &outimg, inlink->format); } else { s->end_frame_filter(ctx, &inimg, NULL); } @@ -553,7 +553,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } if (out != in) - av_frame_free(&in); + av_frame_free(&in); return ff_filter_frame(outlink, out); }