summaryrefslogtreecommitdiff
path: root/vp9/decoder/vp9_decodframe.c
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2013-04-24 15:10:23 -0700
committerJingning Han <jingning@google.com>2013-04-24 15:19:17 -0700
commitb0e3b3df18ade11bd780642a11933df8e09514e9 (patch)
treeb7567e9d3f14fa5da26b8e73827dfa3e92241d51 /vp9/decoder/vp9_decodframe.c
parentff2b8aa2c9f95a8456306d2a9ce28803eb90b38a (diff)
downloadlibvpx-b0e3b3df18ade11bd780642a11933df8e09514e9.tar
libvpx-b0e3b3df18ade11bd780642a11933df8e09514e9.tar.gz
libvpx-b0e3b3df18ade11bd780642a11933df8e09514e9.tar.bz2
libvpx-b0e3b3df18ade11bd780642a11933df8e09514e9.zip
Move sbsegment out of experimental list
Move rectangular superblock coding out of experimental list. Change-Id: I96c37547d122330d666a67b4bf577ae54547857f
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
-rw-r--r--vp9/decoder/vp9_decodframe.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c
index a3445c03a..dae987aba 100644
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -882,7 +882,6 @@ static void decode_modes_sb(VP9D_COMP *pbi, int mb_row, int mb_col,
subsize = bsize;
decode_modes_b(pbi, mb_row, mb_col, r, subsize);
break;
-#if CONFIG_SBSEGMENT
case PARTITION_HORZ:
subsize = (bsize == BLOCK_SIZE_SB64X64) ? BLOCK_SIZE_SB64X32 :
BLOCK_SIZE_SB32X16;
@@ -897,7 +896,6 @@ static void decode_modes_sb(VP9D_COMP *pbi, int mb_row, int mb_col,
if ((mb_col + bs) < pc->mb_cols)
decode_modes_b(pbi, mb_row, mb_col + bs, r, subsize);
break;
-#endif
case PARTITION_SPLIT:
subsize = (bsize == BLOCK_SIZE_SB64X64) ? BLOCK_SIZE_SB32X32 :
BLOCK_SIZE_MB16X16;