From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 20 Jun 2013 17:17:12 +0000 (-0700)
Subject: Merge "Renaming 'nmv' to 'mv' for several functions."
X-Git-Tag: v1.3.0~1059
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8283d893ebb2dab4ecaf7e9037df465fb651d1cd;p=libvpx

Merge "Renaming 'nmv' to 'mv' for several functions."
---

8283d893ebb2dab4ecaf7e9037df465fb651d1cd
diff --cc vp9/common/vp9_findnearmv.c
index a6922715e,07697cbaf..643b229a6
--- a/vp9/common/vp9_findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@@ -13,9 -13,10 +13,9 @@@
  #include "vp9/common/vp9_findnearmv.h"
  #include "vp9/common/vp9_mvref_common.h"
  #include "vp9/common/vp9_sadmxn.h"
 -#include "vp9/common/vp9_subpelvar.h"
  
  static void lower_mv_precision(int_mv *mv, int usehp) {
-   if (!usehp || !vp9_use_nmv_hp(&mv->as_mv)) {
+   if (!usehp || !vp9_use_mv_hp(&mv->as_mv)) {
      if (mv->as_mv.row & 1)
        mv->as_mv.row += (mv->as_mv.row > 0 ? -1 : 1);
      if (mv->as_mv.col & 1)