From: Yaowu Xu <yaowu@google.com>
Date: Thu, 14 Jan 2016 21:57:27 +0000 (-0800)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44da65fb44b4f7b501bfd570085e7dd893b46f97;p=libvpx

Merge branch 'master' into nextgenv2
---

44da65fb44b4f7b501bfd570085e7dd893b46f97
diff --cc vp10/encoder/segmentation.c
index e93677573,677910fa3..969b87fa9
--- a/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
    }
  }