commit 4374e431c144750bb84c94363dfd24eea2c06657
author Debargha Mukherjee <debargha@google.com> Fri May 26 16:57:37 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Sat May 27 15:03:18 2017 -0700
tree 018296f6371797a838f6c30790c870e31ec0bd73
parent 11cf46f4af2fdb8d2468132c2fedc0be00a19b6e

Fix assert failure due to inconsistent comp tools

Fixes AV1/AltRefForcedKeyTestLarge.Frame1IsKey test.

Change-Id: I457b5c1dacb9fd2294c650d11821d6a1930d04dc

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 0e8cafb..d25f4ff 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5537,6 +5537,9 @@
 #endif  // !CONFIG_REF_ADAPT
       }
     }
+#if CONFIG_EXT_INTER
+    make_consistent_compound_tools(cm);
+#endif  // CONFIG_EXT_INTER
 
 #if CONFIG_VAR_TX
     if (cm->tx_mode == TX_MODE_SELECT && cpi->td.mb.txb_split_count == 0)