diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-10-23 11:54:25 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-23 11:54:25 -0700 |
| commit | bf284cee80ad21e2d23f793ea0e8457e005832cc (patch) | |
| tree | c1df1138018fc7cc2c8ee45192397cde814704de /vp8/common/findnearmv.c | |
| parent | 5d739f507e9859dbe87032139b85770f241e9c24 (diff) | |
| parent | 906c1b4bd91ef5d3ba2bcecc359280ed0b31da45 (diff) | |
| download | libvpx-bf284cee80ad21e2d23f793ea0e8457e005832cc.tar libvpx-bf284cee80ad21e2d23f793ea0e8457e005832cc.tar.gz libvpx-bf284cee80ad21e2d23f793ea0e8457e005832cc.tar.bz2 libvpx-bf284cee80ad21e2d23f793ea0e8457e005832cc.zip | |
Merge "changed to avoid code confusion" into experimental
Diffstat (limited to 'vp8/common/findnearmv.c')
| -rw-r--r-- | vp8/common/findnearmv.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vp8/common/findnearmv.c b/vp8/common/findnearmv.c index e1bf5361a..5fc135090 100644 --- a/vp8/common/findnearmv.c +++ b/vp8/common/findnearmv.c @@ -254,11 +254,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, |