diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2011-06-02 13:46:41 -0400 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2011-06-02 13:46:41 -0400 |
| commit | 773768ae27bfe427f153c8e6fadb3912b8f94c1f (patch) | |
| tree | 96bc9e8a572b9e8ecf4d43fc7960a90f06551565 /vp8/encoder/encodeintra.c | |
| parent | 9e4f76c154a355bac2a3e005e47882219801bdae (diff) | |
| download | libvpx-773768ae27bfe427f153c8e6fadb3912b8f94c1f.tar libvpx-773768ae27bfe427f153c8e6fadb3912b8f94c1f.tar.gz libvpx-773768ae27bfe427f153c8e6fadb3912b8f94c1f.tar.bz2 libvpx-773768ae27bfe427f153c8e6fadb3912b8f94c1f.zip | |
Removed B_MODE_INFO
Declared the bmi in BLOCKD as a union instead of B_MODE_INFO.
Then removed B_MODE_INFO completely.
Change-Id: Ieb7469899e265892c66f7aeac87b7f2bf38e7a67
Diffstat (limited to 'vp8/encoder/encodeintra.c')
| -rw-r--r-- | vp8/encoder/encodeintra.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index 835c80d28..5da69bc59 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -36,7 +36,7 @@ void vp8_encode_intra4x4block(const VP8_ENCODER_RTCD *rtcd, BLOCK *be = &x->block[ib]; RECON_INVOKE(&rtcd->common->recon, intra4x4_predict) - (b, b->bmi.mode, b->predictor); + (b, b->bmi.as_mode, b->predictor); ENCODEMB_INVOKE(&rtcd->encodemb, subb)(be, b, 16); @@ -89,19 +89,19 @@ void vp8_encode_intra16x16mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x) switch (x->e_mbd.mode_info_context->mbmi.mode) { case DC_PRED: - d->bmi.mode = B_DC_PRED; + d->bmi.as_mode = B_DC_PRED; break; case V_PRED: - d->bmi.mode = B_VE_PRED; + d->bmi.as_mode = B_VE_PRED; break; case H_PRED: - d->bmi.mode = B_HE_PRED; + d->bmi.as_mode = B_HE_PRED; break; case TM_PRED: - d->bmi.mode = B_TM_PRED; + d->bmi.as_mode = B_TM_PRED; break; default: - d->bmi.mode = B_DC_PRED; + d->bmi.as_mode = B_DC_PRED; break; } } |