Index: source/libvpx/vp9/decoder/vp9_decodemv.c |
=================================================================== |
--- source/libvpx/vp9/decoder/vp9_decodemv.c (revision 292072) |
+++ source/libvpx/vp9/decoder/vp9_decodemv.c (working copy) |
@@ -103,7 +103,7 @@ |
int mi_row, int mi_col, |
vp9_reader *r) { |
struct segmentation *const seg = &cm->seg; |
- const BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type; |
+ const BLOCK_SIZE bsize = xd->mi[0].src_mi->mbmi.sb_type; |
int segment_id; |
if (!seg->enabled) |
@@ -120,7 +120,7 @@ |
static int read_inter_segment_id(VP9_COMMON *const cm, MACROBLOCKD *const xd, |
int mi_row, int mi_col, vp9_reader *r) { |
struct segmentation *const seg = &cm->seg; |
- MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi; |
+ MB_MODE_INFO *const mbmi = &xd->mi[0].src_mi->mbmi; |
const BLOCK_SIZE bsize = mbmi->sb_type; |
int predicted_segment_id, segment_id; |
@@ -160,10 +160,10 @@ |
static void read_intra_frame_mode_info(VP9_COMMON *const cm, |
MACROBLOCKD *const xd, |
int mi_row, int mi_col, vp9_reader *r) { |
- MODE_INFO *const mi = xd->mi[0]; |
+ MODE_INFO *const mi = xd->mi[0].src_mi; |
MB_MODE_INFO *const mbmi = &mi->mbmi; |
- const MODE_INFO *above_mi = xd->mi[-cm->mi_stride]; |
- const MODE_INFO *left_mi = xd->left_available ? xd->mi[-1] : NULL; |
+ const MODE_INFO *above_mi = xd->mi[-cm->mi_stride].src_mi; |
+ const MODE_INFO *left_mi = xd->left_available ? xd->mi[-1].src_mi : NULL; |
const BLOCK_SIZE bsize = mbmi->sb_type; |
int i; |
@@ -519,7 +519,7 @@ |
MACROBLOCKD *const xd, |
const TileInfo *const tile, |
int mi_row, int mi_col, vp9_reader *r) { |
- MODE_INFO *const mi = xd->mi[0]; |
+ MODE_INFO *const mi = xd->mi[0].src_mi; |
MB_MODE_INFO *const mbmi = &mi->mbmi; |
int inter_block; |