diff --git a/README.chromium b/README.chromium
index 9a6b84c58..322e1f577 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 134
+Version: 135
 License: BSD
 License File: LICENSE
 
diff --git a/source/convert.cc b/source/convert.cc
index dece0b392..37b4891e1 100644
--- a/source/convert.cc
+++ b/source/convert.cc
@@ -549,7 +549,7 @@ int RGB24ToI420(const uint8* src_frame, int src_stride_frame,
   } else
 #endif
   {
-    ARGBToUVRow = RGB24ToUVRow_C;
+    ARGBToUVRow = ARGBToUVRow_C;
   }
 
   for (int y = 0; y < (height - 1); y += 2) {
@@ -615,7 +615,7 @@ int RAWToI420(const uint8* src_frame, int src_stride_frame,
   } else
 #endif
   {
-    ARGBToUVRow = RAWToUVRow_C;
+    ARGBToUVRow = ARGBToUVRow_C;
   }
 
   for (int y = 0; y < (height - 1); y += 2) {
@@ -681,7 +681,7 @@ int RGB565ToI420(const uint8* src_frame, int src_stride_frame,
   } else
 #endif
   {
-    ARGBToUVRow = RGB565ToUVRow_C;
+    ARGBToUVRow = ARGBToUVRow_C;
   }
 
   for (int y = 0; y < (height - 1); y += 2) {
@@ -747,7 +747,7 @@ int ARGB1555ToI420(const uint8* src_frame, int src_stride_frame,
   } else
 #endif
   {
-    ARGBToUVRow = ARGB1555ToUVRow_C;
+    ARGBToUVRow = ARGBToUVRow_C;
   }
 
   for (int y = 0; y < (height - 1); y += 2) {
@@ -813,7 +813,7 @@ int ARGB4444ToI420(const uint8* src_frame, int src_stride_frame,
   } else
 #endif
   {
-    ARGBToUVRow = ARGB4444ToUVRow_C;
+    ARGBToUVRow = ARGBToUVRow_C;
   }
 
   for (int y = 0; y < (height - 1); y += 2) {
diff --git a/source/planar_functions.cc b/source/planar_functions.cc
index 5a8f50aa8..1419f238e 100644
--- a/source/planar_functions.cc
+++ b/source/planar_functions.cc
@@ -1624,13 +1624,13 @@ int I420ToABGR(const uint8* src_y, int src_stride_y,
 // Convert NV12 to RGB565.
 int NV12ToRGB565(const uint8* src_y, int src_stride_y,
                  const uint8* src_uv, int src_stride_uv,
-                 uint8* dst_argb, int dst_stride_argb,
+                 uint8* dst_rgb, int dst_stride_rgb,
                  int width, int height) {
   // Negative height means invert the image.
   if (height < 0) {
     height = -height;
-    dst_argb = dst_argb + (height - 1) * dst_stride_argb;
-    dst_stride_argb = -dst_stride_argb;
+    dst_rgb = dst_rgb + (height - 1) * dst_stride_rgb;
+    dst_stride_rgb = -dst_stride_rgb;
   }
   void (*FastConvertYUVToRGB565Row)(const uint8* y_buf,
                                     const uint8* u_buf,
@@ -1644,7 +1644,7 @@ int NV12ToRGB565(const uint8* src_y, int src_stride_y,
 #elif defined(HAS_FASTCONVERTYUVTORGB565ROW_SSSE3)
   if (TestCpuFlag(kCpuHasSSSE3) &&
       IS_ALIGNED(width, 8) &&
-      IS_ALIGNED(dst_argb, 16) && IS_ALIGNED(dst_stride_argb, 16)) {
+      IS_ALIGNED(dst_rgb, 16) && IS_ALIGNED(dst_stride_rgb, 16)) {
     FastConvertYUVToRGB565Row = FastConvertYUVToRGB565Row_SSSE3;
   } else
 #endif
@@ -1675,8 +1675,8 @@ int NV12ToRGB565(const uint8* src_y, int src_stride_y,
       SplitUV(src_uv, row, row + kMaxStride, halfwidth);
       src_uv += src_stride_uv;
     }
-    FastConvertYUVToRGB565Row(src_y, row, row + kMaxStride, dst_argb, width);
-    dst_argb += dst_stride_argb;
+    FastConvertYUVToRGB565Row(src_y, row, row + kMaxStride, dst_rgb, width);
+    dst_rgb += dst_stride_rgb;
     src_y += src_stride_y;
   }
   return 0;
diff --git a/source/row_win.cc b/source/row_win.cc
index 27a9f593e..6fd398593 100644
--- a/source/row_win.cc
+++ b/source/row_win.cc
@@ -375,7 +375,7 @@ __asm {
     sub       edx, eax
 
  convertloop:
-    movdqa    xmm0, [eax] // fetch 8 pixels of bgr565
+    movdqa    xmm0, [eax]   // fetch 8 pixels of bgr565
     movdqa    xmm1, xmm0
     movdqa    xmm2, xmm0
     pand      xmm1, xmm3    // R in upper 5 bits