Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / libvpx / source / libvpx / vp9 / common / vp9_pred_common.h

diff --git a/src/third_party/libvpx/source/libvpx/vp9/common/vp9_pred_common.h b/src/third_party/libvpx/source/libvpx/vp9/common/vp9_pred_common.h
index 1a7ba86..39774f1 100644 (file)
--- a/src/third_party/libvpx/source/libvpx/vp9/common/vp9_pred_common.h
+++ b/src/third_party/libvpx/source/libvpx/vp9/common/vp9_pred_common.h
@@ -19,14 +19,14 @@ extern "C" {
 #endif
 
 static INLINE const MODE_INFO *get_above_mi(const MACROBLOCKD *const xd) {
-  return xd->up_available ? xd->mi[-xd->mi_stride] : NULL;
+  return xd->up_available ? xd->mi[-xd->mi_stride].src_mi : NULL;
 }
 
 static INLINE const MODE_INFO *get_left_mi(const MACROBLOCKD *const xd) {
-  return xd->left_available ? xd->mi[-1] : NULL;
+  return xd->left_available ? xd->mi[-1].src_mi : NULL;
 }
 
-int vp9_get_segment_id(VP9_COMMON *cm, const uint8_t *segment_ids,
+int vp9_get_segment_id(const VP9_COMMON *cm, const uint8_t *segment_ids,
                        BLOCK_SIZE bsize, int mi_row, int mi_col);
 
 static INLINE int vp9_get_pred_context_seg_id(const MACROBLOCKD *xd) {