Merge branch 'masterbase' into nextgenv2

Conflicts:
	configure

Change-Id: I7f331981e19338451d16030f0ac1179db2e08c4d

diff --cc configure
index 54816560e458ccb231be9c50b0078c1978e61adb,a40f3abb642c65826a1d5540385934f869d7717f..8bb20b723ca0852271a3cab63c1e3a8966379fd2
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -264,11 -264,7 +264,10 @@@ EXPERIMENT_LIST=
      spatial_svc
      fp_mb_stats
      emulate_hardware
 +    var_tx
 +    ext_tx
      misc_fixes
-     universal_hp
 +    ext_intra
  "
  CONFIG_LIST="
      dependency_tracking

diff --cc vp10/common/entropymode.c
index e2cecbfdd80ac27bb86b6a0141671e8ad70105d0,80983057543b7fcb76b6eba66d371146585b19ce..ccfd6de4a87b5f9f3bac05be096aa75a1b6da82d
--- 1/vp10/common/entropymode.c
--- 2/vp10/common/entropymode.c
+++ b/vp10/common/entropymode.c
@@@ -971,21 -867,9 +971,21 @@@ void vp10_adapt_intra_frame_probs(VP10_
      fc->skip_probs[i] = mode_mv_merge_probs(
          pre_fc->skip_probs[i], counts->skip[i]);
  
 +#if CONFIG_EXT_TX
 +  for (i = TX_4X4; i <= TX_16X16; ++i) {
 +    int j;
 +    vpx_tree_merge_probs(vp10_tx_type_tree, pre_fc->inter_tx_type_prob[i],
 +                         counts->inter_tx_type[i], fc->inter_tx_type_prob[i]);
 +
 +    for (j = 0; j < INTRA_MODES; ++j)
 +      vpx_tree_merge_probs(vp10_tx_type_tree, pre_fc->intra_tx_type_prob[i][j],
 +                           counts->intra_tx_type[i][j],
 +                           fc->intra_tx_type_prob[i][j]);
 +  }
 +#endif  // CONFIG_EXT_TX
  #if CONFIG_MISC_FIXES
    if (cm->seg.temporal_update) {
-     for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
+     for (i = 0; i < PREDICTION_PROBS; i++)
        fc->seg.pred_probs[i] = mode_mv_merge_probs(pre_fc->seg.pred_probs[i],
                                                    counts->seg.pred[i]);
  

diff --cc vp10/decoder/decodeframe.c
Simple merge

diff --cc vp10/encoder/bitstream.c
Simple merge

diff --cc vp10/encoder/encodeframe.c
Simple merge