From patchwork Fri Aug 26 18:19:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 306 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp524364vsd; Fri, 26 Aug 2016 11:23:15 -0700 (PDT) X-Received: by 10.28.173.205 with SMTP id w196mr211660wme.86.1472235795664; Fri, 26 Aug 2016 11:23:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c194si211585wme.107.2016.08.26.11.23.14; Fri, 26 Aug 2016 11:23:15 -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; 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 E0A4A689B0F; Fri, 26 Aug 2016 21:22:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D7D36897E5 for ; Fri, 26 Aug 2016 21:22:48 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1bdLmE-0008B6-Rg for ffmpeg-devel@ffmpeg.org; Fri, 26 Aug 2016 20:22:50 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id buNp1t00N0S5wYM01uNqgB; Fri, 26 Aug 2016 20:22:50 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 26 Aug 2016 20:19:29 +0200 Message-Id: <20160826181929.26502-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avfilter/motion_estimation: Fix pre processor formating 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" IIRC, The spaces are not standard before the # Signed-off-by: Michael Niedermayer --- libavfilter/motion_estimation.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/motion_estimation.c b/libavfilter/motion_estimation.c index fa6f49d..0f9ba21 100644 --- a/libavfilter/motion_estimation.c +++ b/libavfilter/motion_estimation.c @@ -262,10 +262,10 @@ uint64_t ff_me_search_ds(AVMotionEstContext *me_ctx, int x_mb, int y_mb, int *mv x = mv[0]; y = mv[1]; - #if 1 +#if 1 for (i = 0; i < 8; i++) COST_P_MV(x + dia2[i][0], y + dia2[i][1]); - #else +#else /* this version skips previously examined 3 or 5 locations based on prev origin */ if (dir_x <= 0) COST_P_MV(x - 2, y); @@ -286,7 +286,7 @@ uint64_t ff_me_search_ds(AVMotionEstContext *me_ctx, int x_mb, int y_mb, int *mv dir_x = mv[0] - x; dir_y = mv[1] - y; - #endif +#endif } while (x != mv[0] || y != mv[1]);