Merge "Don't send segment probability updates when the map isn't updated." into nextgenv2

vp10/decoder/decodeframe.c

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index 70f9396..921ada6 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -3463,7 +3463,7 @@
   for (k = 0; k < SKIP_CONTEXTS; ++k)
     vp10_diff_update_prob(&r, &fc->skip_probs[k]);
 
-  if (cm->seg.enabled) {
+  if (cm->seg.enabled && cm->seg.update_map) {
     if (cm->seg.temporal_update) {
       for (k = 0; k < PREDICTION_PROBS; k++)
         vp10_diff_update_prob(&r, &cm->fc->seg.pred_probs[k]);

vp10/encoder/bitstream.c

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index ce2708e..54df99a 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -2544,9 +2544,9 @@
 static void update_seg_probs(VP10_COMP *cpi, vp10_writer *w) {
   VP10_COMMON *cm = &cpi->common;
 
-  if (!cpi->common.seg.enabled) return;
+  if (!cm->seg.enabled || !cm->seg.update_map) return;
 
-  if (cpi->common.seg.temporal_update) {
+  if (cm->seg.temporal_update) {
     int i;
 
     for (i = 0; i < PREDICTION_PROBS; i++)