Merge "Converting vp9_treecoder.h to vp9_prob.{h, c}"

diff --cc vp9/common/vp9_blockd.h
Simple merge

diff --cc vp9/common/vp9_pred_common.c
index 03f4cc2,6a9a36c..82631c9
--- 1/vp9/common/vp9_pred_common.c
--- 2/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@@ -14,10 -14,13 +14,9 @@@
  #include "vp9/common/vp9_common.h"
  #include "vp9/common/vp9_pred_common.h"
  #include "vp9/common/vp9_seg_common.h"
- #include "vp9/common/vp9_treecoder.h"
  
 -static INLINE const MB_MODE_INFO *get_above_mbmi(const MODE_INFO *const above) {
 -  return (above != NULL) ? &above->mbmi : NULL;
 -}
 -
 -static INLINE const MB_MODE_INFO *get_left_mbmi(const MODE_INFO *const left) {
 -  return (left != NULL) ? &left->mbmi : NULL;
 +static INLINE const MB_MODE_INFO *get_mbmi(const MODE_INFO *const mi) {
 +  return (mi != NULL) ? &mi->mbmi : NULL;
  }
  
  // Returns a context number for the given MB prediction signal

diff --cc vp9/common/vp9_seg_common.h
Simple merge

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge