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/decoder/decodframe.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/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 80e8723d6..fec517228 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -288,7 +288,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, BLOCKD *b = &xd->block[i]; RECON_INVOKE(RTCD_VTABLE(recon), intra4x4_predict) - (b, b->bmi.mode, b->predictor); + (b, b->bmi.as_mode, b->predictor); if (xd->eobs[i] > 1) { @@ -974,8 +974,6 @@ int vp8_decode_frame(VP8D_COMP *pbi) vpx_memset(pc->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * pc->mb_cols); - vpx_memcpy(&xd->block[0].bmi, &xd->mode_info_context->bmi[0], sizeof(B_MODE_INFO)); - #if CONFIG_MULTITHREAD if (pbi->b_multithreaded_rd && pc->multi_token_partition != ONE_PARTITION) { |