commit 9bc1d8de72a258725a3d5f2f1b51bf25fcc280f4
author hui su <huisu@google.com> Fri Mar 24 12:36:03 2017 -0700
committer Hui Su <huisu@google.com> Fri Mar 24 20:43:22 2017 +0000
tree 42618cdbb050e351ff61b3c42290f26c68eb7b42
parent d767bebd5c10d723f419621862b384ab9440320a

Fix a conflict between palette and cb4x4

Palette is only enabled for blocks>=8x8

Change-Id: Ia12d42413b0345e5f298ded9e41118622008d233

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 544c3f1..2d79031 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2204,6 +2204,7 @@
         mbmi->palette_mode_info.palette_size[plane];
     if (palette_size_plane > 0) {
       int rows, cols;
+      assert(mbmi->sb_type >= BLOCK_8X8);
       av1_get_block_dimensions(mbmi->sb_type, plane, xd, NULL, NULL, &rows,
                                &cols);
       assert(*tok < tok_end);