Merge "Fix bug in sb8x8 bitstream decoding." into experimental

abb66ef0 · Ronald S. Bultje · Gerrit Code Review · 31b84263 · 29492a5e · abb66ef0
Commit abb66ef0 authored May 01, 2013 by Ronald S. Bultje Committed by Gerrit Code Review May 01, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

vp9/decoder/vp9_decodemv.c vp9/decoder/vp9_decodemv.c +5 -1

No files found.
--- 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;