diff --git a/README.chromium b/README.chromium
index b129675b2..b2064cf1f 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 330
+Version: 331
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 9ae71ad48..6dd68c83a 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 330
+#define LIBYUV_VERSION 331
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/planar_functions.cc b/source/planar_functions.cc
index ffe3cde37..1f3b8ff3d 100644
--- a/source/planar_functions.cc
+++ b/source/planar_functions.cc
@@ -54,11 +54,11 @@ void CopyPlane(const uint8* src_y, int src_stride_y,
   }
 }
 
-// Convert I420 to I400.  (calls CopyPlane ignoring u/v)
+// Convert I420 to I400.
 int I420ToI400(const uint8* src_y, int src_stride_y,
+               uint8*, int,  // src_u
+               uint8*, int,  // src_v
                uint8* dst_y, int dst_stride_y,
-               uint8*, int,
-               uint8*, int,
                int width, int height) {
   if (!src_y || !dst_y || width <= 0 || height == 0) {
     return -1;
diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc
index 0b86ac0e9..66f4b4158 100644
--- a/unit_test/planar_test.cc
+++ b/unit_test/planar_test.cc
@@ -90,6 +90,15 @@ TESTPLANARTOB(I420, 2, 2, ARGB4444, 2)
 TESTPLANARTOB(I411, 4, 1, ARGB, 4)
 TESTPLANARTOB(I422, 2, 1, ARGB, 4)
 TESTPLANARTOB(I444, 1, 1, ARGB, 4)
+TESTPLANARTOB(I420, 2, 2, YUY2, 2)
+TESTPLANARTOB(I420, 2, 2, UYVY, 2)
+TESTPLANARTOB(I420, 2, 2, V210, 3)
+// V210 is 22.5 bpp but 3 bytes will suffice for unittest.
+TESTPLANARTOB(I420, 2, 2, I400, 1)
+TESTPLANARTOB(I420, 2, 2, BayerBGGR, 1)
+TESTPLANARTOB(I420, 2, 2, BayerRGGB, 1)
+TESTPLANARTOB(I420, 2, 2, BayerGBRG, 1)
+TESTPLANARTOB(I420, 2, 2, BayerGRBG, 1)
 
 
 #define TESTBIPLANARTOB(FMT_PLANAR, SUBSAMP_X, SUBSAMP_Y, FMT_B, BPP_B)        \