libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_rd.h

Index: source/libvpx/vp9/encoder/vp9_rd.h
===================================================================
--- source/libvpx/vp9/encoder/vp9_rd.h	(revision 292072)
+++ source/libvpx/vp9/encoder/vp9_rd.h	(working copy)
@@ -51,6 +51,12 @@
 
   THR_NEARMV,
   THR_NEARA,
+  THR_NEARG,
+
+  THR_ZEROMV,
+  THR_ZEROG,
+  THR_ZEROA,
+
   THR_COMP_NEARESTLA,
   THR_COMP_NEARESTGA,
 
@@ -58,13 +64,9 @@
 
   THR_COMP_NEARLA,
   THR_COMP_NEWLA,
-  THR_NEARG,
   THR_COMP_NEARGA,
   THR_COMP_NEWGA,
 
-  THR_ZEROMV,
-  THR_ZEROG,
-  THR_ZEROA,
   THR_COMP_ZEROLA,
   THR_COMP_ZEROGA,
 
@@ -98,6 +100,8 @@
   int threshes[MAX_SEGMENTS][BLOCK_SIZES][MAX_MODES];
   int thresh_freq_fact[BLOCK_SIZES][MAX_MODES];
 
+  int mode_map[BLOCK_SIZES][MAX_MODES];
+
   int64_t comp_pred_diff[REFERENCE_MODES];
   int64_t prediction_type_threshes[MAX_REF_FRAMES][REFERENCE_MODES];
   int64_t tx_select_diff[TX_MODES];