libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_modecosts.c

Index: source/libvpx/vp9/encoder/vp9_modecosts.c
===================================================================
--- source/libvpx/vp9/encoder/vp9_modecosts.c	(revision 219822)
+++ source/libvpx/vp9/encoder/vp9_modecosts.c	(working copy)
@@ -20,8 +20,8 @@
   const vp9_tree_p KT = vp9_intra_mode_tree;
   int i, j;
 
-  for (i = 0; i < VP9_INTRA_MODES; i++) {
-    for (j = 0; j < VP9_INTRA_MODES; j++) {
+  for (i = 0; i < INTRA_MODES; i++) {
+    for (j = 0; j < INTRA_MODES; j++) {
       vp9_cost_tokens((int *)c->mb.y_mode_costs[i][j], vp9_kf_y_mode_prob[i][j],
                       KT);
     }
@@ -31,12 +31,12 @@
   vp9_cost_tokens(c->mb.mbmode_cost, x->fc.y_mode_prob[1],
                   vp9_intra_mode_tree);
   vp9_cost_tokens(c->mb.intra_uv_mode_cost[1],
-                  x->fc.uv_mode_prob[VP9_INTRA_MODES - 1], vp9_intra_mode_tree);
+                  x->fc.uv_mode_prob[INTRA_MODES - 1], vp9_intra_mode_tree);
   vp9_cost_tokens(c->mb.intra_uv_mode_cost[0],
-                  vp9_kf_uv_mode_prob[VP9_INTRA_MODES - 1],
+                  vp9_kf_uv_mode_prob[INTRA_MODES - 1],
                   vp9_intra_mode_tree);
 
-  for (i = 0; i <= VP9_SWITCHABLE_FILTERS; ++i)
+  for (i = 0; i <= SWITCHABLE_FILTERS; ++i)
     vp9_cost_tokens((int *)c->mb.switchable_interp_costs[i],
                     x->fc.switchable_interp_prob[i],
                     vp9_switchable_interp_tree);