commit dc9720433f9df0840c5ce4071630e1b47f18d563
author Yaowu Xu <yaowu@google.com> Mon Nov 07 22:03:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 07 22:03:12 2016 +0000
tree 38ff9e75ecb4841287da4b180b95a1d5f7c9dbaf
parent 4007fa6852e6fe793d1a00b1826682bbf3581c7c
parent 02d4c3b780a8958ba7bde5bce8dffc200bed4600

Merge "Fix compiler warning of un-used variables" into nextgenv2

av1/common/warped_motion.c

diff --git a/av1/common/warped_motion.c b/av1/common/warped_motion.c
index 2534345..7bbf20f 100644
--- a/av1/common/warped_motion.c
+++ b/av1/common/warped_motion.c
@@ -186,9 +186,9 @@
 
 static int32_t do_cubic_filter(int32_t *p, int x) {
   if (x == 0) {
-    return p[0];
+    return p[0] * (1 << WARPEDPIXEL_FILTER_BITS);
   } else if (x == (1 << WARPEDPIXEL_PREC_BITS)) {
-    return p[1];
+    return p[1] * (1 << WARPEDPIXEL_FILTER_BITS);
   } else {
     const int64_t v1 = (int64_t)x * x * x * (3 * (p[0] - p[1]) + p[2] - p[-1]);
     const int64_t v2 = x * x * (2 * p[-1] - 5 * p[0] + 4 * p[1] - p[2]);