3 files changed, 0 insertions, 13 deletions
diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c
index 0f5c48d91..38c09bf7d 100644
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -218,7 +218,6 @@ void vp8_create_common(VP8_COMMON *oci)
     oci->filter_type = NORMAL_LOOPFILTER;
     oci->use_bilinear_mc_filter = 0;
     oci->full_pixel = 0;
-    oci->multi_token_partition = ONE_PARTITION;
     oci->clr_type = REG_YUV;
     oci->clamp_type = RECON_CLAMP_REQUIRED;
 
diff --git a/vp8/common/onyx.h b/vp8/common/onyx.h
index 53a3d23cc..574c8bfb5 100644
--- a/vp8/common/onyx.h
+++ b/vp8/common/onyx.h
@@ -166,8 +166,6 @@ extern "C"
         int play_alternate;
         int alt_freq;
 
-        int multi_threaded;   // how many threads to run the encoder on
-        int token_partitions; // how many token partitions to create for multi core decoding
         int encode_breakout;  // early breakout encode threshold : for video conf recommend 800
 
         int arnr_max_frames;
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index 233fd2fa9..41d15f58f 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -64,14 +64,6 @@ typedef struct frame_contexts
 
 typedef enum
 {
-    ONE_PARTITION  = 0,
-    TWO_PARTITION  = 1,
-    FOUR_PARTITION = 2,
-    EIGHT_PARTITION = 3
-} TOKEN_PARTITION;
-
-typedef enum
-{
     RECON_CLAMP_REQUIRED        = 0,
     RECON_CLAMP_NOTREQUIRED     = 1
 } CLAMP_TYPE;
@@ -259,8 +251,6 @@ typedef struct VP8Common
     int near_boffset[3];
     int version;
 
-    TOKEN_PARTITION multi_token_partition;
-
 #ifdef PACKET_TESTING
     VP8_HEADER oh;
 #endif