Fix unaligned access violation in YUY2ToARGB

BUG=none
TEST=build bot

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

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 468
+Version: 469
 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 468
+#define LIBYUV_VERSION 469
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/convert_argb.cc

@@ -747,7 +747,8 @@ int YUY2ToARGB(const uint8* src_yuy2, int src_stride_yuy2,
     YUY2ToARGBRow = YUY2ToARGBRow_Any_SSSE3;
     if (IS_ALIGNED(width, 8)) {
       YUY2ToARGBRow = YUY2ToARGBRow_Unaligned_SSSE3;
-      if (IS_ALIGNED(dst_argb, 16) && IS_ALIGNED(dst_stride_argb, 16)) {
+      if (IS_ALIGNED(src_argb, 16) && IS_ALIGNED(src_stride_argb, 16) &&
+          IS_ALIGNED(dst_argb, 16) && IS_ALIGNED(dst_stride_argb, 16)) {
         YUY2ToARGBRow = YUY2ToARGBRow_SSSE3;
       }
     }
@@ -790,7 +791,8 @@ int UYVYToARGB(const uint8* src_uyvy, int src_stride_uyvy,
     UYVYToARGBRow = UYVYToARGBRow_Any_SSSE3;
     if (IS_ALIGNED(width, 8)) {
       UYVYToARGBRow = UYVYToARGBRow_Unaligned_SSSE3;
-      if (IS_ALIGNED(dst_argb, 16) && IS_ALIGNED(dst_stride_argb, 16)) {
+      if (IS_ALIGNED(src_argb, 16) && IS_ALIGNED(src_stride_argb, 16) &&
+          IS_ALIGNED(dst_argb, 16) && IS_ALIGNED(dst_stride_argb, 16)) {
         UYVYToARGBRow = UYVYToARGBRow_SSSE3;
       }
     }