diff --git a/README.chromium b/README.chromium
index b270062fa..7dbebaa56 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 948
+Version: 949
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 2c69f1e0e..83ea87def 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 948
+#define LIBYUV_VERSION 949
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/scale_common.cc b/source/scale_common.cc
index 04c5af2d8..21a1424a7 100644
--- a/source/scale_common.cc
+++ b/source/scale_common.cc
@@ -681,10 +681,10 @@ void ScaleSlope(int src_width, int src_height,
   assert(dst_width > 0);
   assert(dst_height > 0);
   // Check for 1 pixel and avoid FixedDiv overflow.
-  if (dst_width == 1) {
+  if (dst_width == 1 && src_width >= 32768) {
     dst_width = src_width;
   }
-  if (dst_height == 1) {
+  if (dst_height == 1 && src_height >= 32768) {
     dst_height = src_height;
   }
   if (filtering == kFilterBox) {
diff --git a/source/video_common.cc b/source/video_common.cc
index 341c3ea3b..b13c8407e 100644
--- a/source/video_common.cc
+++ b/source/video_common.cc
@@ -38,13 +38,12 @@ static const FourCCAliasEntry kFourCCAliases[] = {
   {FOURCC_BGR3, FOURCC_24BG},
   {FOURCC_CM32, FOURCC_BGRA},  // kCMPixelFormat_32ARGB
   {FOURCC_CM24, FOURCC_RAW },  // kCMPixelFormat_24RGB
-#if defined(__APPLE__)
-  {FOURCC_BGRA, FOURCC_ARGB},  // kCMPixelFormat_32BGRA
-#endif
   {FOURCC_L555, FOURCC_RGBO},  // kCMPixelFormat_16LE555
   {FOURCC_L565, FOURCC_RGBP},  // kCMPixelFormat_16LE565
   {FOURCC_5551, FOURCC_RGBO},  // kCMPixelFormat_16LE5551
 };
+// TODO(fbarchard): Consider mapping kCMPixelFormat_32BGRA to FOURCC_ARGB.
+//  {FOURCC_BGRA, FOURCC_ARGB},  // kCMPixelFormat_32BGRA
 
 LIBYUV_API
 uint32 CanonicalFourCC(uint32 fourcc) {
diff --git a/unit_test/video_common_test.cc b/unit_test/video_common_test.cc
index 49c908f6b..d9f36153b 100644
--- a/unit_test/video_common_test.cc
+++ b/unit_test/video_common_test.cc
@@ -56,11 +56,6 @@ TEST_F(libyuvTest, TestCanonicalFourCC) {
   EXPECT_EQ(FOURCC_24BG, CanonicalFourCC(FOURCC_BGR3));
   EXPECT_EQ(FOURCC_BGRA, CanonicalFourCC(FOURCC_CM32));
   EXPECT_EQ(FOURCC_RAW,  CanonicalFourCC(FOURCC_CM24));
-#if defined(__APPLE__)
-  EXPECT_EQ(FOURCC_ARGB, CanonicalFourCC(FOURCC_BGRA));
-#else
-  EXPECT_EQ(FOURCC_BGRA, CanonicalFourCC(FOURCC_BGRA));
-#endif
   EXPECT_EQ(FOURCC_RGBO, CanonicalFourCC(FOURCC_L555));
   EXPECT_EQ(FOURCC_RGBP, CanonicalFourCC(FOURCC_L565));
   EXPECT_EQ(FOURCC_RGBO, CanonicalFourCC(FOURCC_5551));