diff --git a/README.chromium b/README.chromium
index 42c319ceb..abdc184aa 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1790
+Version: 1791
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 2b9693a5c..9ab8f1ee6 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1790
+#define LIBYUV_VERSION 1791
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/source/convert_from.cc b/source/convert_from.cc
index 687f0a72c..62a13d049 100644
--- a/source/convert_from.cc
+++ b/source/convert_from.cc
@@ -772,7 +772,8 @@ int ConvertFromI420(const uint8_t* y,
                    height);
       break;
     case FOURCC_NV12: {
-      uint8_t* dst_uv = dst_sample + width * height;
+      int dst_y_stride = dst_sample_stride ? dst_sample_stride : width;
+      uint8_t* dst_uv = dst_sample + dst_y_stride * height;
       r = I420ToNV12(y, y_stride, u, u_stride, v, v_stride, dst_sample,
                      dst_sample_stride ? dst_sample_stride : width, dst_uv,
                      dst_sample_stride ? dst_sample_stride : width, width,
@@ -780,7 +781,8 @@ int ConvertFromI420(const uint8_t* y,
       break;
     }
     case FOURCC_NV21: {
-      uint8_t* dst_vu = dst_sample + width * height;
+      int dst_y_stride = dst_sample_stride ? dst_sample_stride : width;
+      uint8_t* dst_vu = dst_sample + dst_y_stride * height;
       r = I420ToNV21(y, y_stride, u, u_stride, v, v_stride, dst_sample,
                      dst_sample_stride ? dst_sample_stride : width, dst_vu,
                      dst_sample_stride ? dst_sample_stride : width, width,