commit c12e9bd0e44c0cfbda567a972483574de6d4d061
author gitbuildkicker <android-build@google.com> Wed Apr 26 00:07:45 2017 -0700
committer gitbuildkicker <android-build@google.com> Wed Apr 26 00:07:45 2017 -0700
tree d09f1ce475537f3a9f283f6dcffccf2853fa6406
parent b281539ba96d4563227984fa49c7c94383e4259a
parent 61e3fa9ea3ca5347b35a2eb96fc68025c083c0d6

merge in oc-release history after reset to oc-dev

files/source/row_any.cc

diff --git a/files/source/row_any.cc b/files/source/row_any.cc
index af5d1fb..88c2cf1 100644
--- a/files/source/row_any.cc
+++ b/files/source/row_any.cc
@@ -158,13 +158,13 @@
 ANY31C(I444ToARGBRow_Any_AVX2, I444ToARGBRow_AVX2, 0, 0, 4, 15)
 #endif
 #ifdef HAS_I422TOARGB4444ROW_AVX2
-ANY31C(I422ToARGB4444Row_Any_AVX2, I422ToARGB4444Row_AVX2, 1, 0, 2, 7)
+ANY31C(I422ToARGB4444Row_Any_AVX2, I422ToARGB4444Row_AVX2, 1, 0, 2, 15)
 #endif
 #ifdef HAS_I422TOARGB1555ROW_AVX2
-ANY31C(I422ToARGB1555Row_Any_AVX2, I422ToARGB1555Row_AVX2, 1, 0, 2, 7)
+ANY31C(I422ToARGB1555Row_Any_AVX2, I422ToARGB1555Row_AVX2, 1, 0, 2, 15)
 #endif
 #ifdef HAS_I422TORGB565ROW_AVX2
-ANY31C(I422ToRGB565Row_Any_AVX2, I422ToRGB565Row_AVX2, 1, 0, 2, 7)
+ANY31C(I422ToRGB565Row_Any_AVX2, I422ToRGB565Row_AVX2, 1, 0, 2, 15)
 #endif
 #ifdef HAS_I422TOARGBROW_NEON
 ANY31C(I444ToARGBRow_Any_NEON, I444ToARGBRow_NEON, 0, 0, 4, 7)