commit 36b545888ed53ff03a0fa9fb9d83ebee42f71031
author Yaowu Xu <yaowu@google.com> Tue Jun 20 11:14:09 2017 -0700
committer Yaowu Xu <yaowu@google.com> Tue Jun 20 22:11:34 2017 +0000
tree a68aefd6a0fad3336b37a408380576e6cdfd0d87
parent 562a39370cf5a5b9fbcc37de9b78f0c0801022e9

Change left shifts to multiplications

avoid warnings about left shift of negative numbers.

BUG=aomedia:617

Change-Id: I8793132c562759b0cc9eefb7c7a50fddb3149184

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index c8a0a99..09d5354 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -1166,7 +1166,7 @@
       x = (c << 8) - y * dx;
       base = x >> frac_bits_x;
       if (base >= min_base_x) {
-        shift = (x << upsample_above) & 0xFF;
+        shift = (x * (1 << upsample_above)) & 0xFF;
 #if CONFIG_INTRA_INTERP
         val = highbd_intra_subpel_interp(base, shift, above, -1, bw - 1,
                                          filter_type);
@@ -1178,7 +1178,7 @@
         x = c + 1;
         y = (r << 8) - x * dy;
         base = y >> frac_bits_y;
-        shift = (y << upsample_left) & 0xFF;
+        shift = (y * (1 << upsample_left)) & 0xFF;
 #if CONFIG_INTRA_INTERP
         val = highbd_intra_subpel_interp(base, shift, left, -1, bh - 1,
                                          filter_type);