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

diff --cc vp9/common/vp9_findnearmv.c
index a692271,07697cb..643b229
--- 1/vp9/common/vp9_findnearmv.c
--- 2/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)

diff --cc vp9/decoder/vp9_decodemv.c
Simple merge

diff --cc vp9/decoder/vp9_decodframe.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge