commit 01770b3e20698a0faaa78a9fb892191ba71ff4e4
author Emil Keyder <emilkeyder@kazandibi.nyc.corp.google.com> Fri Jan 20 18:03:11 2017 -0500
committer Emil Keyder <emilkeyder@google.com> Mon Jan 23 21:12:35 2017 +0000
tree ccb5f48eba7fd52a7e800d27f3631c00fd887329
parent 13797462df6a97110076593979fe0283f9f7e919

Rename NONE to NONE_FRAME.

This follows the naming for the other frame types, and allows libaom
to be compiled against other libraries that also #define NONE.

Change-Id: Ic2e2814587bbc5ea67385a9af775396d29b7dde0

av1/encoder/mbgraph.c

diff --git a/av1/encoder/mbgraph.c b/av1/encoder/mbgraph.c
index 1f63222..52974e2 100644
--- a/av1/encoder/mbgraph.c
+++ b/av1/encoder/mbgraph.c
@@ -71,7 +71,7 @@
 
   xd->mi[0]->mbmi.mv[0] = x->best_mv;
 #if CONFIG_EXT_INTER
-  xd->mi[0]->mbmi.ref_frame[1] = NONE;
+  xd->mi[0]->mbmi.ref_frame[1] = NONE_FRAME;
 #endif  // CONFIG_EXT_INTER
 
   av1_build_inter_predictors_sby(xd, mb_row, mb_col, NULL, BLOCK_16X16);
@@ -246,7 +246,7 @@
   xd->mi[0] = &mi_local;
   mi_local.mbmi.sb_type = BLOCK_16X16;
   mi_local.mbmi.ref_frame[0] = LAST_FRAME;
-  mi_local.mbmi.ref_frame[1] = NONE;
+  mi_local.mbmi.ref_frame[1] = NONE_FRAME;
 
   for (mb_row = 0; mb_row < cm->mb_rows; mb_row++) {
     MV gld_left_mv = gld_top_mv;