From: Ronald S. Bultje <rbultje@google.com>
Date: Tue, 16 Oct 2012 19:41:56 +0000 (-0700)
Subject: Fix a mismatch if a keyframe contains skip-blocks.
X-Git-Tag: v1.3.0~1217^2~227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9443f05e6b10c2f4de9d21a77df2108dd829529b;p=libvpx

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 bb2160701..73e71f85b 100644
--- 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);