commit 31da10b41f77db2abf67acffa4aee0624116a4fa
author Debargha Mukherjee <debargha@google.com> Tue Jun 07 20:23:44 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 07 20:23:44 2016 +0000
tree d4e6ef8f2a19e253bb167ba4d01573d421cbd9b1
parent ac232300a2ac09e0a716892af99162daf54d75d2
parent 6279d1293d992eccda3e5b48a28d4b6b00669602

Merge "Pick up top left mbmi for supertx decode." into nextgenv2

vp10/decoder/decodeframe.c

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index d9e0d2c..83d08b1 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -1785,9 +1785,10 @@
 
     if (!skip) {
       int eobtotal = 0;
-      MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
+      MB_MODE_INFO *mbmi;
       set_offsets_topblock(cm, xd, tile, bsize, mi_row, mi_col);
-      xd->mi[0]->mbmi.tx_type = txfm;
+      mbmi = &xd->mi[0]->mbmi;
+      mbmi->tx_type = txfm;
       for (i = 0; i < MAX_MB_PLANE; ++i) {
         const struct macroblockd_plane *const pd = &xd->plane[i];
         const int num_4x4_w = pd->n4_w;