commit 10a0380a9118d93e5d78d2796b81f031aab4b444
author RogerZhou <youzhou@microsoft.com> Thu Oct 26 11:49:48 2017 -0700
committer Roger Zhou <youzhou@microsoft.com> Fri Oct 27 00:06:15 2017 +0000
tree 510b38b48ddb4517efef207678e51d3a6a1e0c01
parent 43edb7605669c5c59b2b6c3377d4c48018918987

Fixed build conflict (amvr,intrabc).

Change-Id: Ibfeb424bf0ebab7bbeb69f6f6df24a4f4924ec97

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 29b2573..5403318 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3341,7 +3341,7 @@
       seg_skip = segfeature_active(seg, segment_id, SEG_LVL_SKIP);
     }
 #if CONFIG_AMVR
-    xd->cur_frame_mv_precision_level = cm->cur_frame_mv_precision_level;
+    xd->cur_frame_force_integer_mv = cm->cur_frame_force_integer_mv;
 #endif
 
     if (cm->delta_q_present_flag) {