commit 86e277911a9954dd380559d3964a3cad0edf9a94
author Jingning Han <jingning@google.com> Fri Jan 27 13:56:16 2017 -0800
committer Jingning Han <jingning@google.com> Fri Jan 27 13:58:08 2017 -0800
tree 082e07c567652dfa1d527870e1ea300bb62bc675
parent 4bab6e4f58713619f09077a0c104c3f4e4acb049

Fix ext-partition/type in cb4x4 mode

This commit fixes the encoding/decoding mismatch issue when
ext-partition and ext-partition-type are both turned on in cb4x4
mode.

BUG=aomedia:336

Change-Id: I4d6ad5863c9d3bc8e3a41c259b8b39f130164790

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 4c260fa..7cf30eb 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -373,6 +373,10 @@
 #if CONFIG_EXT_PARTITION
 /* clang-format off */
 static const uint16_t *const orders_verta[BLOCK_SIZES] = {
+#if CONFIG_CB4X4
+  // 2X2,           2X4,              4X2
+  orders_4x4,       orders_4x4,       orders_4x4,
+#endif
   //                                  4X4
                                       orders_verta_8x8,
   // 4X8,           8X4,              8X8