commit 8b6132169018c84417eb8456609e3b8ff00c6d40
author Debargha Mukherjee <debargha@google.com> Wed Jan 25 13:50:16 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Thu Jan 26 02:05:45 2017 +0000
tree 12fe6971d5ed22d0e717ea38ed6b64d5a31cb91a
parent 1c4a878f8b3f245b1eb4d500ce9651cef51753a8

Fix mismatch w/ ext-inter/warped-motion/motion-var

Fixes a mismatch issue with ext-inter+motion-var+warped-motion
due to unset num_proj_ref values.

BUG=aomedia:311

Change-Id: I042551f6c53e8cc005f2133704a03b243c98c12a

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6cd9e30..b9516be 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8570,6 +8570,9 @@
 #if CONFIG_WARPED_MOTION
   aom_clear_system_state();
   mbmi->num_proj_ref[0] = findSamples(cm, xd, mi_row, mi_col, pts, pts_inref);
+#if CONFIG_EXT_INTER
+  best_bmc_mbmi.num_proj_ref[0] = mbmi->num_proj_ref[0];
+#endif  // CONFIG_EXT_INTER
 #endif  // CONFIG_WARPED_MOTION
 #if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
   rate2_nocoeff = rd_stats->rate;