Commit a2db5815 authored by Alex Converse's avatar Alex Converse Committed by Gerrit Code Review
Browse files

Merge "Fix ans+ref_mv build." into nextgenv2

parents 0a91b2da 8c9da4e9
......@@ -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 {
......
......@@ -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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment