diff --git a/README.chromium b/README.chromium
index a1c4e3d3b..e835cc1ba 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 357
+Version: 358
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index b17f5a278..23e91e3c6 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 357
+#define LIBYUV_VERSION 358
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc
index 30c3a6be7..3cb7b9a92 100644
--- a/unit_test/planar_test.cc
+++ b/unit_test/planar_test.cc
@@ -41,8 +41,8 @@ TEST_F(libyuvTest, FMT_PLANAR##To##FMT_B##N##_OptVsC) {                        \
   for (int i = 0; i < kHeight; ++i)                                            \
     for (int j = 0; j < kWidth; ++j)                                           \
       src_y[(i * kWidth) + j] = (random() & 0xff);                             \
-  for (int i = 0; i < kHeight / SUBSAMP_X; ++i)                                \
-    for (int j = 0; j < kWidth / SUBSAMP_Y; ++j) {                             \
+  for (int i = 0; i < kHeight / SUBSAMP_Y; ++i)                                \
+    for (int j = 0; j < kWidth / SUBSAMP_X; ++j) {                             \
       src_u[(i * kWidth / SUBSAMP_X) + j] = (random() & 0xff);                 \
       src_v[(i * kWidth / SUBSAMP_X) + j] = (random() & 0xff);                 \
     }                                                                          \
@@ -117,8 +117,8 @@ TEST_F(libyuvTest, FMT_PLANAR##To##FMT_B##N##_OptVsC) {                        \
   for (int i = 0; i < kHeight; ++i)                                            \
     for (int j = 0; j < kWidth; ++j)                                           \
       src_y[(i * kWidth) + j] = (random() & 0xff);                             \
-  for (int i = 0; i < kHeight / SUBSAMP_X; ++i)                                \
-    for (int j = 0; j < kWidth / SUBSAMP_Y * 2; ++j) {                         \
+  for (int i = 0; i < kHeight / SUBSAMP_Y; ++i)                                \
+    for (int j = 0; j < kWidth / SUBSAMP_X * 2; ++j) {                         \
       src_uv[(i * kWidth / SUBSAMP_X) * 2 + j] = (random() & 0xff);            \
     }                                                                          \
   MaskCpuFlags(kCpuInitialized);                                               \