Upstream version 10.38.208.0

[platform/framework/web/crosswalk.git] / src / third_party / libvpx / source / libvpx / vp9 / encoder / vp9_bitstream.c

diff --git a/src/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c b/src/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
index 841b465..f9996c7 100644 (file)
--- a/src/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
+++ b/src/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
@@ -423,11 +423,13 @@ static void write_modes_sb(VP9_COMP *cpi,
   const int bs = (1 << bsl) / 4;
   PARTITION_TYPE partition;
   BLOCK_SIZE subsize;
-  MODE_INFO *m = cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col];
+  const MODE_INFO *m = NULL;
 
   if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
     return;
 
+  m = cm->mi_grid_visible[mi_row * cm->mi_stride + mi_col];
+
   partition = partition_lookup[bsl][m->mbmi.sb_type];
   write_partition(cm, xd, bs, mi_row, mi_col, partition, bsize, w);
   subsize = get_subsize(bsize, partition);