diff options
Diffstat (limited to 'vp9/encoder/vp9_tokenize.c')
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index 6f2cbbf24..0edf126bd 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -147,7 +147,6 @@ static void tokenize_b(VP9_COMP *cpi, l2 = l1 + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); a3 = a2 + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); l3 = l2 + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); -#if CONFIG_SBSEGMENT } else if (sb_type == BLOCK_SIZE_SB32X64) { a = (ENTROPY_CONTEXT *)xd->above_context + vp9_block2above_sb32x64[tx_size][ib]; @@ -164,14 +163,12 @@ static void tokenize_b(VP9_COMP *cpi, a1 = a + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); l1 = l + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); a2 = a3 = l2 = l3 = NULL; -#endif } else if (sb_type == BLOCK_SIZE_SB32X32) { a = (ENTROPY_CONTEXT *)xd->above_context + vp9_block2above_sb[tx_size][ib]; l = (ENTROPY_CONTEXT *)xd->left_context + vp9_block2left_sb[tx_size][ib]; a1 = a + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); l1 = l + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); a2 = a3 = l2 = l3 = NULL; -#if CONFIG_SBSEGMENT } else if (sb_type == BLOCK_SIZE_SB16X32) { a = (ENTROPY_CONTEXT *)xd->above_context + vp9_block2above_sb16x32[tx_size][ib]; @@ -188,7 +185,6 @@ static void tokenize_b(VP9_COMP *cpi, a1 = a + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); l1 = l + sizeof(ENTROPY_CONTEXT_PLANES) / sizeof(ENTROPY_CONTEXT); a1 = l1 = a2 = l2 = a3 = l3 = NULL; -#endif } else { assert(sb_type == BLOCK_SIZE_MB16X16); a = (ENTROPY_CONTEXT *)xd->above_context + vp9_block2above[tx_size][ib]; |