Merge "vp8e - static threshold play"

diff --cc vp8/encoder/rdopt.c
index 432b76f,0b902dc..bc5fd40
--- 1/vp8/encoder/rdopt.c
--- 2/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@@ -2238,11 -2198,9 +2238,10 @@@ int vp8_rd_pick_inter_mode(VP8_COMP *cp
  
              vp8_set_mbmode_and_mvs(x, this_mode, &mode_mv[this_mode]);
              vp8_build_inter_predictors_mby(&x->e_mbd);
 -            VARIANCE_INVOKE(&cpi->rtcd.variance, get16x16var)(x->src.y_buffer, x->src.y_stride, x->e_mbd.predictor, 16, (unsigned int *)(&sse), &sum);
 +            if(x->encode_breakout)
 +                VARIANCE_INVOKE(&cpi->rtcd.variance, get16x16var)(x->src.y_buffer, x->src.y_stride, x->e_mbd.predictor, 16, (unsigned int *)(&sse), &sum);
  
-             if (cpi->active_map_enabled && x->active_ptr[0] == 0)
-             {
+             if (cpi->active_map_enabled && x->active_ptr[0] == 0) {
                  x->skip = 1;
              }
              else if (sse < x->encode_breakout)