Merge branch 'master' into nextgenv2

diff --cc configure
Simple merge

diff --cc vp10/encoder/segmentation.c
index e93677573baad75c08dd848fc5fea923b3b081f0,677910fa37c16f0b31acefe535ae93846e80af64..969b87fa96d9925b292a7f34d41a1555a660e53b
--- 1/vp10/encoder/segmentation.c
--- 2/vp10/encoder/segmentation.c
+++ b/vp10/encoder/segmentation.c
@@@ -273,9 -300,17 +273,10 @@@ void vp10_choose_segmap_coding_method(V
  
    // Now choose which coding method to use.
    if (t_pred_cost < no_pred_cost) {
+     assert(!cm->error_resilient_mode);
      seg->temporal_update = 1;
 -#if !CONFIG_MISC_FIXES
 -    memcpy(segp->tree_probs, t_pred_tree, sizeof(t_pred_tree));
 -    memcpy(segp->pred_probs, t_nopred_prob, sizeof(t_nopred_prob));
 -#endif
    } else {
      seg->temporal_update = 0;
 -#if !CONFIG_MISC_FIXES
 -    memcpy(segp->tree_probs, no_pred_tree, sizeof(no_pred_tree));
 -#endif
    }
  }
  

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

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