From: Alex Converse <aconverse@google.com>
Date: Mon, 9 May 2016 22:35:58 +0000 (-0700)
Subject: Fix ans+ref_mv build.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c9da4e943003f4dad71f22fc58de45f22642296;p=libvpx

Fix ans+ref_mv build.

Use vp10_read/write instead of vpx_read/write.

Change-Id: I2b7f17e9cdbea14ff48f4bd9776dd3e6aff17a2b
---

diff --git a/vp10/decoder/decodemv.c b/vp10/decoder/decodemv.c
index 38ede53d7..e7a1ce3bd 100644
--- a/vp10/decoder/decodemv.c
+++ b/vp10/decoder/decodemv.c
@@ -696,7 +696,7 @@ static INLINE void read_mv(vp10_reader *r, MV *mv, const MV *ref,
 
 #if CONFIG_REF_MV && !CONFIG_EXT_INTER
   if (is_compound) {
-    int is_zero_rmv = vpx_read(r, ctx->zero_rmv);
+    int is_zero_rmv = vp10_read(r, ctx->zero_rmv);
     if (is_zero_rmv) {
       joint_type = MV_JOINT_ZERO;
     } else {
diff --git a/vp10/encoder/encodemv.c b/vp10/encoder/encodemv.c
index 2149a8e2d..727d6b532 100644
--- a/vp10/encoder/encodemv.c
+++ b/vp10/encoder/encodemv.c
@@ -250,7 +250,7 @@ void vp10_encode_mv(VP10_COMP* cpi, vp10_writer* w,
 
 #if CONFIG_REF_MV && !CONFIG_EXT_INTER
   if (is_compound) {
-    vpx_write(w, (j == MV_JOINT_ZERO), mvctx->zero_rmv);
+    vp10_write(w, (j == MV_JOINT_ZERO), mvctx->zero_rmv);
     if (j == MV_JOINT_ZERO)
       return;
   } else {