ref: bf284cee80ad21e2d23f793ea0e8457e005832cc
parent: 5d739f507e9859dbe87032139b85770f241e9c24
parent: 906c1b4bd91ef5d3ba2bcecc359280ed0b31da45
author: Yaowu Xu <yaowu@google.com>
date: Tue Oct 23 07:54:25 EDT 2012
Merge "changed to avoid code confusion" into experimental
--- a/vp8/common/findnearmv.c
+++ b/vp8/common/findnearmv.c
@@ -254,11 +254,10 @@
// 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,
--
⑨