commit 24e0a184212b226ba29b196a23fd2b7083d154ca
author Jingning Han <jingning@google.com> Sun Nov 20 22:34:12 2016 -0800
committer Jingning Han <jingning@google.com> Sun Nov 20 22:35:55 2016 -0800
tree 816f99a03df2fe74e5f1235a295aa21555434138
parent 4a97d6ac5b5f5b618b728fc4cf356ea855731c9f

Merge simp_pred_mv changes into ref_mv

Merge the modifications in simp_pred_mv to ref_mv.

Change-Id: I5662124c1ac7133d76697522f06e42b277a4ad8d

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 10595a5..e0e16a0 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4823,7 +4823,7 @@
 
   x->min_partition_size = AOMMIN(x->min_partition_size, cm->sb_size);
   x->max_partition_size = AOMMIN(x->max_partition_size, cm->sb_size);
-#if CONFIG_SIMP_MV_PRED
+#if CONFIG_REF_MV
   cm->setup_mi(cm);
 #endif