From: Ronald S. Bultje <rbultje@google.com>
Date: Wed, 1 May 2013 21:50:39 +0000 (-0700)
Subject: Fix bug in sb8x8 bitstream decoding.
X-Git-Tag: v1.3.0~1106^2~87^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29492a5e14c398a907e4be3dacc75a695a1b20c8;p=platform%2Fupstream%2Flibvpx.git

Fix bug in sb8x8 bitstream decoding.

Change-Id: I7ac69a369851b09d9422f2e3c62b12b3fcd49a4c
---

diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c
index 0e55657..55c6737 100644
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -205,7 +205,11 @@ static void kfread_modes(VP9D_COMP *pbi, MODE_INFO *m,
   } else if (cm->txfm_mode >= ALLOW_32X32 &&
              m->mbmi.sb_type >= BLOCK_SIZE_SB32X32) {
     m->mbmi.txfm_size = TX_32X32;
-  } else if (cm->txfm_mode >= ALLOW_16X16 && m->mbmi.mode <= TM_PRED) {
+  } else if (cm->txfm_mode >= ALLOW_16X16 &&
+#if CONFIG_SB8X8
+             m->mbmi.sb_type >= BLOCK_SIZE_MB16X16 &&
+#endif
+             m->mbmi.mode <= TM_PRED) {
     m->mbmi.txfm_size = TX_16X16;
   } else if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != I4X4_PRED) {
     m->mbmi.txfm_size = TX_8X8;