From patchwork Wed May 13 14:42:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19665 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 C7B2C44A624 for ; Wed, 13 May 2020 17:42:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE870687FEC; Wed, 13 May 2020 17:42:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0ABE568048D for ; Wed, 13 May 2020 17:42:47 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id u15so2949769plm.2 for ; Wed, 13 May 2020 07:42:46 -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=97j+KiIpfzQRK6nI91KDawLEh0gZkDv+NwbWGh10UqU=; b=A28MnUqmjD3ftSeZzjk5JtH+BNzq+HEOXaftZfo+xWC/oHTsTb3l1lhDGLHsjYbjeZ cpRHNiyIUxpFsUklLqWF9triYUxcCuV37a9qUR29X6LUAjGMCY1zKtAl9Pq19XbWfylp dQBGjU876wKWLdJvmfvKCIGQ/zoQ+ofYqrf7qWk62CbyPbmaz7+1i9hmsknFAsp7acSX M4tLRMk/lFIVvGMDX/8+7sKNNfcvGWb8M1lIJCu942Tooj+zQTf4xPhMytKsGegv1ZHv /ocjUoPdhcKZpNbm2P0rSYFbcvlERZvhWvqeOh1tKTnJdfUn58az8Ht32dC1amXeGQnR +GCw== 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=97j+KiIpfzQRK6nI91KDawLEh0gZkDv+NwbWGh10UqU=; b=FEJ0g50I3WKG4euNIc0AM5I/jRP5ZNffrZDdls7Fa6ovVfgeqIjxH8JX/Ob8nlPv76 atD0RUeYQjko1oPEIKnavT5ADrW/gJz2eDTorOBn48Y4l10EJ1OGFshvnOBRpvYt/m0O pR3+hdzldi/gQu/c/A4YeOeB20FmECZ2aVDFr5EgFuvM10uYgnk1Sp/cHxEtE8A4sOYy VfEV7NWtI+V0PPAZuk5Y0w8oiDcaDVYyTeXB4gPUt6Y+el7lZwNKBIjea4FoqNJGOBfp tuEcyOwa+84thrYpTvKEVe6RLCVeZEj4JNs7k6pkxIHE+gd3s9NYm2sHaV+mv6OBFpyY XnXw== X-Gm-Message-State: AGi0PubKsSxeLM1+grI1gPOzUWHBflNb8+Fa8zSsAxNBWB4XJD8L+W/B fjzKPSsh+vzXZcJpMTp//HeMkjvu X-Google-Smtp-Source: APiQypLoxD8ffTBT6fFhU1wZqo7KXlCr9p/QbsJGFEEJjC6zW9jzxW5AJ1UQL7eS4MA1Kw2LfBmHTw== X-Received: by 2002:a17:90a:8c98:: with SMTP id b24mr25678870pjo.226.1589380964922; Wed, 13 May 2020 07:42:44 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c184sm791410pfc.57.2020.05.13.07.42.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 May 2020 07:42:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 May 2020 22:42:36 +0800 Message-Id: <1589380957-23603-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589380957-23603-1-git-send-email-lance.lmwang@gmail.com> References: <1589380957-23603-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] 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 b7a9282..c8512cc 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); }