diff --git a/README.chromium b/README.chromium
index d9a8bf0cf..51c55e8ec 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 946
+Version: 947
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 5a77ae714..c68d4e964 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 946
+#define LIBYUV_VERSION 947
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/scale_argb.cc b/source/scale_argb.cc
index 079d7400f..c7c73b237 100644
--- a/source/scale_argb.cc
+++ b/source/scale_argb.cc
@@ -171,9 +171,9 @@ static void ScaleARGBBilinearDown(int src_width, int src_height,
   assert(src_height > 0);
   assert(dst_width > 0);
   assert(dst_height > 0);
-  int xlast = x + (dst_width - 1) * dx;
-  int xl = (dx >= 0) ? x : xlast;
-  int xr = (dx >= 0) ? xlast : x;
+  int64 xlast = x + static_cast<int64>(dst_width - 1) * dx;
+  int64 xl = (dx >= 0) ? x : xlast;
+  int64 xr = (dx >= 0) ? xlast : x;
   xl = (xl >> 16) & ~3;  // Left edge aligned.
   xr = (xr >> 16) + 1;  // Right most pixel used.
   int clip_src_width = (((xr - xl) + 1 + 3) & ~3) * 4;  // Width aligned to 4.