From 906c1b4bd91ef5d3ba2bcecc359280ed0b31da45 Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Mon, 22 Oct 2012 13:58:26 -0700
Subject: [PATCH] changed to avoid code confusion

The previous double if and else code snippets were rather confusing.

Change-Id: Id1b6152fa0e471beb9b20407aa406e109c1471e3
---
 vp8/common/findnearmv.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/vp8/common/findnearmv.c b/vp8/common/findnearmv.c
index 285aabdb69..7c9ea1066f 100644
--- a/vp8/common/findnearmv.c
+++ b/vp8/common/findnearmv.c
@@ -241,11 +241,10 @@ void vp8_find_best_ref_mvs(MACROBLOCKD *xd,
 
     // If we see a 0,0 vector for a second time we have reached the end of
     // the list of valid candidate vectors.
-    if (!this_mv.as_int)
-      if (zero_seen)
-        break;
-      else
-        zero_seen = TRUE;
+    if (!this_mv.as_int && zero_seen)
+      break;
+
+    zero_seen = zero_seen || !this_mv.as_int;
 
     vp8_clamp_mv(&this_mv,
                  xd->mb_to_left_edge - LEFT_TOP_MARGIN + 16,
-- 
GitLab