summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunqing Wang <yunqingwang@google.com>2011-05-25 11:35:42 -0700
committerCode Review <code-review@webmproject.org>2011-05-25 11:35:42 -0700
commit13b56eeb7a6a61c599c397a3b8cd5b6f77c2f07b (patch)
treec425c416abd4046d78852de130ed2e19e8f74e4c
parentf299d628f381915943285e41df1ce902d3b4fa73 (diff)
parenta615c4049998f51e5123d7051020d38c35603f3d (diff)
downloadlibvpx-13b56eeb7a6a61c599c397a3b8cd5b6f77c2f07b.tar
libvpx-13b56eeb7a6a61c599c397a3b8cd5b6f77c2f07b.tar.gz
libvpx-13b56eeb7a6a61c599c397a3b8cd5b6f77c2f07b.tar.bz2
libvpx-13b56eeb7a6a61c599c397a3b8cd5b6f77c2f07b.zip
Merge " Use var8x8 instead of get8x8var in VP8_UVSSE"
-rw-r--r--vp8/encoder/rdopt.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index db0395d94..f0514ad8c 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -464,11 +464,10 @@ int VP8_UVSSE(MACROBLOCK *x, const vp8_variance_rtcd_vtable_t *rtcd)
}
else
{
- int sum2, sum1;
- VARIANCE_INVOKE(rtcd, get8x8var)(uptr, pre_stride,
- upred_ptr, uv_stride, &sse2, &sum2);
- VARIANCE_INVOKE(rtcd, get8x8var)(vptr, pre_stride,
- vpred_ptr, uv_stride, &sse1, &sum1);
+ VARIANCE_INVOKE(rtcd, var8x8)(uptr, pre_stride,
+ upred_ptr, uv_stride, &sse2);
+ VARIANCE_INVOKE(rtcd, var8x8)(vptr, pre_stride,
+ vpred_ptr, uv_stride, &sse1);
sse2 += sse1;
}
return sse2;