shithub: libvpx

Download patch

ref: abb66ef0ba3858888a5fc7b7e9cb30b8e61d4859
parent: 31b842637f64d57db03dd4db24ae7b00c2a643d2
parent: 29492a5e14c398a907e4be3dacc75a695a1b20c8
author: Ronald S. Bultje <rbultje@google.com>
date: Wed May 1 15:26:26 EDT 2013 

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


--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -205,7 +205,11 @@
   } 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;