summaryrefslogtreecommitdiff
path: root/vp8
diff options
context:
space:
mode:
authorScott LaVarnway <slavarnway@google.com>2012-01-05 09:06:28 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2012-01-05 09:06:28 -0800
commitb2c8dff727e9020baed12feb40268f555cd4c8fc (patch)
tree93adeb9ea54884c3b6969f663ebb30afcaed7cba /vp8
parent89cdfdb2312a6381e66c353a50221185c6ddfa9f (diff)
parentc4aa1d508ecf0f1cb18d38cd2eff280f8690ba06 (diff)
downloadlibvpx-b2c8dff727e9020baed12feb40268f555cd4c8fc.tar
libvpx-b2c8dff727e9020baed12feb40268f555cd4c8fc.tar.gz
libvpx-b2c8dff727e9020baed12feb40268f555cd4c8fc.tar.bz2
libvpx-b2c8dff727e9020baed12feb40268f555cd4c8fc.zip
Merge "Removed unused diff buffer"
Diffstat (limited to 'vp8')
-rw-r--r--vp8/common/blockd.h2
-rw-r--r--vp8/common/mbpitch.c5
2 files changed, 0 insertions, 7 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 99b731c78..1f3c5d188 100644
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -184,7 +184,6 @@ typedef struct
short *qcoeff;
short *dqcoeff;
unsigned char *predictor;
- short *diff;
short *dequant;
/* 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries */
@@ -203,7 +202,6 @@ typedef struct
typedef struct MacroBlockD
{
- DECLARE_ALIGNED(16, short, diff[400]); /* from idct diff */
DECLARE_ALIGNED(16, unsigned char, predictor[384]);
DECLARE_ALIGNED(16, short, qcoeff[400]);
DECLARE_ALIGNED(16, short, dqcoeff[400]);
diff --git a/vp8/common/mbpitch.c b/vp8/common/mbpitch.c
index 11fa3ffa7..f8971d754 100644
--- a/vp8/common/mbpitch.c
+++ b/vp8/common/mbpitch.c
@@ -87,7 +87,6 @@ void vp8_setup_block_dptrs(MACROBLOCKD *x)
{
for (c = 0; c < 4; c++)
{
- x->block[r*4+c].diff = &x->diff[r * 4 * 16 + c * 4];
x->block[r*4+c].predictor = x->predictor + r * 4 * 16 + c * 4;
}
}
@@ -96,7 +95,6 @@ void vp8_setup_block_dptrs(MACROBLOCKD *x)
{
for (c = 0; c < 2; c++)
{
- x->block[16+r*2+c].diff = &x->diff[256 + r * 4 * 8 + c * 4];
x->block[16+r*2+c].predictor = x->predictor + 256 + r * 4 * 8 + c * 4;
}
@@ -106,14 +104,11 @@ void vp8_setup_block_dptrs(MACROBLOCKD *x)
{
for (c = 0; c < 2; c++)
{
- x->block[20+r*2+c].diff = &x->diff[320+ r * 4 * 8 + c * 4];
x->block[20+r*2+c].predictor = x->predictor + 320 + r * 4 * 8 + c * 4;
}
}
- x->block[24].diff = &x->diff[384];
-
for (r = 0; r < 25; r++)
{
x->block[r].qcoeff = x->qcoeff + r * 16;