Remove predictor pointers from BLOCKD

Access these members from MACROBLOCKD instead.

Change-Id: I2574622e577bb9feede47f6b7ccbb11f3e928ca8

2 files changed, 0 insertions, 20 deletions

diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index 7f1225143..b6354855a 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -279,12 +279,6 @@ typedef struct {
 } MODE_INFO;
 
 typedef struct blockd {
-  /* 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries */
-  uint8_t **base_pre;
-  uint8_t **base_second_pre;
-  int pre;
-  int pre_stride;
-
   uint8_t **base_dst;
   int dst;
   int dst_stride;
diff --git a/vp9/common/vp9_mbpitch.c b/vp9/common/vp9_mbpitch.c
index 6f6a26e1f..3a918522b 100644
--- a/vp9/common/vp9_mbpitch.c
+++ b/vp9/common/vp9_mbpitch.c
@@ -22,11 +22,6 @@ static void setup_block(BLOCKD *b, uint8_t **base, uint8_t **base2,
     b->dst_stride = stride;
     b->dst = offset;
     b->base_dst = base;
-  } else {
-    b->pre_stride = stride;
-    b->pre = offset;
-    b->base_pre = base;
-    b->base_second_pre = base2;
   }
 }
 
@@ -43,14 +38,6 @@ static void setup_macroblock(MACROBLOCKD *mb, BLOCKSET bs) {
     y2 = NULL;
     u2 = NULL;
     v2 = NULL;
-  } else {
-    y = &mb->plane[0].pre[0].buf;
-    u = &mb->plane[1].pre[0].buf;
-    v = &mb->plane[2].pre[0].buf;
-
-    y2 = &mb->plane[0].pre[1].buf;
-    u2 = &mb->plane[1].pre[1].buf;
-    v2 = &mb->plane[2].pre[1].buf;
   }
 
   // luma
@@ -82,5 +69,4 @@ void vp9_setup_block_dptrs(MACROBLOCKD *mb) {
 void vp9_build_block_doffsets(MACROBLOCKD *mb) {
   // handle the destination pitch features
   setup_macroblock(mb, DEST);
-  setup_macroblock(mb, PRED);
 }