summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_enums.h
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/common/vp9_enums.h
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/common/vp9_enums.h')
-rw-r--r--vp9/common/vp9_enums.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h
index d9a6721a7..23ed3e145 100644
--- a/vp9/common/vp9_enums.h
+++ b/vp9/common/vp9_enums.h
@@ -16,30 +16,22 @@
typedef enum BLOCK_SIZE_TYPE {
#if CONFIG_SB8X8
BLOCK_SIZE_SB8X8,
-#if CONFIG_SBSEGMENT
BLOCK_SIZE_SB8X16,
BLOCK_SIZE_SB16X8,
#endif
-#endif
BLOCK_SIZE_MB16X16,
-#if CONFIG_SBSEGMENT
BLOCK_SIZE_SB16X32,
BLOCK_SIZE_SB32X16,
-#endif
BLOCK_SIZE_SB32X32,
-#if CONFIG_SBSEGMENT
BLOCK_SIZE_SB32X64,
BLOCK_SIZE_SB64X32,
-#endif
BLOCK_SIZE_SB64X64,
} BLOCK_SIZE_TYPE;
typedef enum PARTITION_TYPE {
PARTITION_NONE,
-#if CONFIG_SBSEGMENT
PARTITION_HORZ,
PARTITION_VERT,
-#endif
PARTITION_SPLIT,
PARTITION_TYPES
} PARTITION_TYPE;