Fix row coalescing for NV12 and NV21 to I420.

BUG=none
TEST=none
R=tpsiaki@google.com

Review URL: https://webrtc-codereview.appspot.com/3379004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@841 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 841
+Version: 842
 License: BSD
 License File: LICENSE
 

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 841
+#define LIBYUV_VERSION 842
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/convert.cc

@@ -381,8 +381,8 @@ static int X420ToI420(const uint8* src_y,
   }
   // Coalesce rows.
   if (src_stride_uv == halfwidth * 2 &&
-      dst_stride_u * 2 == halfwidth &&
-      dst_stride_v * 2 == halfwidth) {
+      dst_stride_u == halfwidth &&
+      dst_stride_v == halfwidth) {
     halfwidth *= halfheight;
     halfheight = 1;
     src_stride_uv = dst_stride_u = dst_stride_v = 0;