summaryrefslogtreecommitdiff
path: root/vp8
diff options
context:
space:
mode:
Diffstat (limited to 'vp8')
-rw-r--r--vp8/common/blockd.h2
-rw-r--r--vp8/encoder/mcomp.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 46d002af9..940b0b4f8 100644
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -435,7 +435,7 @@ typedef struct MacroBlockD {
int corrupted;
-#if ARCH_X86 || ARCH_X86_64
+#if !CONFIG_SUPERBLOCKS && (ARCH_X86 || ARCH_X86_64)
/* This is an intermediate buffer currently used in sub-pixel motion search
* to keep a copy of the reference area. This buffer can be used for other
* purpose.
diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c
index a0621b649..79e10a5bc 100644
--- a/vp8/encoder/mcomp.c
+++ b/vp8/encoder/mcomp.c
@@ -456,7 +456,7 @@ int vp8_find_best_sub_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
int y_stride;
MACROBLOCKD *xd = &x->e_mbd;
-#if ARCH_X86 || ARCH_X86_64
+#if !CONFIG_SUPERBLOCKS && (ARCH_X86 || ARCH_X86_64)
unsigned char *y0 = *(d->base_pre) + d->pre + (bestmv->as_mv.row) * d->pre_stride + bestmv->as_mv.col;
unsigned char *y;
@@ -923,7 +923,7 @@ int vp8_find_best_half_pixel_step(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
int y_stride;
MACROBLOCKD *xd = &x->e_mbd;
-#if ARCH_X86 || ARCH_X86_64
+#if !CONFIG_SUPERBLOCKS && (ARCH_X86 || ARCH_X86_64)
unsigned char *y0 = *(d->base_pre) + d->pre +
(bestmv->as_mv.row) * d->pre_stride + bestmv->as_mv.col;
unsigned char *y;