From: Dmitry Kovalev <dkovalev@google.com>
Date: Fri, 28 Feb 2014 18:38:42 +0000 (-0800)
Subject: Merge "Replacing int_mv with MV and adding const qualifiers."
X-Git-Tag: v1.4.0~2216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=761eef0310295b006648c1313bea2a839fe8aabe;p=libvpx

Merge "Replacing int_mv with MV and adding const qualifiers."
---

761eef0310295b006648c1313bea2a839fe8aabe
diff --cc vp9/encoder/vp9_encodemv.h
index 7f997ff37,eb0e24f19..f16b2c17c
--- a/vp9/encoder/vp9_encodemv.h
+++ b/vp9/encoder/vp9_encodemv.h
@@@ -26,9 -26,10 +26,10 @@@ void vp9_encode_mv(VP9_COMP *cpi, vp9_w
                     const nmv_context* mvctx, int usehp);
  
  void vp9_build_nmv_cost_table(int *mvjoint, int *mvcost[2],
 -                              const nmv_context* const mvctx, int usehp);
 +                              const nmv_context* mvctx, int usehp);
  
- void vp9_update_mv_count(VP9_COMP *cpi, MACROBLOCK *x, int_mv best_ref_mv[2]);
+ void vp9_update_mv_count(VP9_COMMON *cm, const MACROBLOCKD *xd,
+                          const MV best_ref_mv[2]);
  
  #ifdef __cplusplus
  }  // extern "C"