Fix a mismatch if a keyframe contains skip-blocks.

Change-Id: I0681d3183f51627be8c2bb76f343b7270f9116d8

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index bb2160701f732c6eb16134944ceb9d1e08fd51d1..73e71f85b6f2633dcd4b3e322520d39884812bd4 100644 (file)
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -4379,6 +4379,7 @@ void vp8_rd_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x,
   if (cpi->common.mb_no_coeff_skip &&
       y_intra16x16_skippable && uv_intra_skippable_8x8) {
     mbmi->mb_skip_coeff = 1;
+    mbmi->mode = mode16x16;
     mbmi->uv_mode = modeuv;
     rate = rateuv8x8 + rate16x16 - rateuv8x8_tokenonly - rate16x16_tokenonly +
            vp8_cost_bit(get_pred_prob(cm, xd, PRED_MBSKIP), 1);