Index: include/libyuv/row.h |
diff --git a/include/libyuv/row.h b/include/libyuv/row.h |
index 8880210436671adfd8e2846154290f53826fce60..5de839df198d2a6c49ebe9fa95a6435d144bb062 100644 |
--- a/include/libyuv/row.h |
+++ b/include/libyuv/row.h |
@@ -200,13 +200,11 @@ extern "C" { |
#if !(defined(_DEBUG) && defined(__i386__)) |
// TODO(fbarchard): fix build error on android_full_debug=1 |
// https://code.google.com/p/libyuv/issues/detail?id=517 |
-// AVX2 versions fail on gcc. b/522 |
-// #define HAS_I422ALPHATOARGBROW_AVX2 |
+#define HAS_I422ALPHATOARGBROW_AVX2 |
#endif |
-// AVX2 versions fail on gcc. b/522 |
-// #define HAS_I422TOARGBROW_AVX2 |
-// #define HAS_I422TORGB24ROW_AVX2 |
-// #define HAS_I422TORGBAROW_AVX2 |
+#define HAS_I422TOARGBROW_AVX2 |
+#define HAS_I422TORGB24ROW_AVX2 |
+#define HAS_I422TORGBAROW_AVX2 |
#define HAS_INTERPOLATEROW_AVX2 |
#define HAS_J422TOARGBROW_AVX2 |
#define HAS_MERGEUVROW_AVX2 |
@@ -241,9 +239,9 @@ extern "C" { |
#define HAS_ARGBTOARGB4444ROW_AVX2 |
#define HAS_ARGBTORGB565ROW_AVX2 |
#define HAS_I411TOARGBROW_AVX2 |
-// #define HAS_I422TOARGB1555ROW_AVX2 |
-// #define HAS_I422TOARGB4444ROW_AVX2 |
-// #define HAS_I422TORGB565ROW_AVX2 |
+#define HAS_I422TOARGB1555ROW_AVX2 |
+#define HAS_I422TOARGB4444ROW_AVX2 |
+#define HAS_I422TORGB565ROW_AVX2 |
#define HAS_I444TOARGBROW_AVX2 |
#define HAS_J400TOARGBROW_AVX2 |
#define HAS_NV12TORGB565ROW_AVX2 |