summaryrefslogtreecommitdiff
path: root/vp8/encoder/mcomp.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@google.com>2012-08-27 18:04:53 -0700
committerRonald S. Bultje <rbultje@google.com>2012-08-28 09:18:24 -0700
commit8e8fb27694d8e7763f8496f1d8911402c6cd3927 (patch)
treea1822f1bbae6e86446905bddf0d339554e4ffbf8 /vp8/encoder/mcomp.c
parent0256398cb7f8c1df577589a294c94ad29e1a36c1 (diff)
downloadlibvpx-8e8fb27694d8e7763f8496f1d8911402c6cd3927.tar
libvpx-8e8fb27694d8e7763f8496f1d8911402c6cd3927.tar.gz
libvpx-8e8fb27694d8e7763f8496f1d8911402c6cd3927.tar.bz2
libvpx-8e8fb27694d8e7763f8496f1d8911402c6cd3927.zip
Disable 16x16 temp buffer for superblocks.
Change-Id: I3d585bae446c16fcf7a39d72c1bcd6468a7bb1a1
Diffstat (limited to 'vp8/encoder/mcomp.c')
-rw-r--r--vp8/encoder/mcomp.c4
1 files changed, 2 insertions, 2 deletions
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;