commit cb603790b080120f28efd538ca8a5d61927434d2
author Debargha Mukherjee <debargha@google.com> Tue Oct 04 13:10:23 2016 -0700
committer Debargha Mukherjee <debargha@google.com> Tue Oct 04 13:22:21 2016 -0700
tree 20c816fb1c17c6483fa9e6e93737be4cdf51b0b6
parent 1a16a987eee60d089bab7a47d25320c48762cf8c

Fix a compiler warning in ext-inter experiment

Change-Id: If36417c1384646da57453344b208e7653a4d31e5

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index d822d09..2966e77 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8738,7 +8738,7 @@
     }
 
 #if CONFIG_EXT_INTER
-    mbmi->interintra_mode = (PREDICTION_MODE)(DC_PRED - 1);
+    mbmi->interintra_mode = (INTERINTRA_MODE)(II_DC_PRED - 1);
 #endif  // CONFIG_EXT_INTER
 
     if (ref_frame == INTRA_FRAME) {
@@ -8892,7 +8892,7 @@
 #if CONFIG_EXT_INTER
       if (second_ref_frame == INTRA_FRAME) {
         if (best_single_inter_ref != ref_frame) continue;
-        mbmi->interintra_mode = best_intra_mode;
+        mbmi->interintra_mode = intra_to_interintra_mode[best_intra_mode];
 #if CONFIG_EXT_INTRA
         // TODO(debargha|geza.lore):
         // Should we use ext_intra modes for interintra?