Merge "Populate bmi for B_PRED only"

[libvpx] / vp8 / encoder / encodeintra.c

diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c
index cc2e44f62956b2f2247d237dbcb06f0016c0f598..f076bbbb3bc0b2eb9eaf241d1aa8db34790ef08a 100644 (file)
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -109,30 +109,6 @@ void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
     RECON_INVOKE(&rtcd->common->recon, recon_mby)
         (IF_RTCD(&rtcd->common->recon), &x->e_mbd);
 
-    // make sure block modes are set the way we want them for context updates
-    for (b = 0; b < 16; b++)
-    {
-        BLOCKD *d = &x->e_mbd.block[b];
-
-        switch (x->e_mbd.mode_info_context->mbmi.mode)
-        {
-        case DC_PRED:
-            d->bmi.as_mode = B_DC_PRED;
-            break;
-        case V_PRED:
-            d->bmi.as_mode = B_VE_PRED;
-            break;
-        case H_PRED:
-            d->bmi.as_mode = B_HE_PRED;
-            break;
-        case TM_PRED:
-            d->bmi.as_mode = B_TM_PRED;
-            break;
-        default:
-            d->bmi.as_mode = B_DC_PRED;
-            break;
-        }
-    }
 }
 
 void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)