ref: b12f531cc52945aaa51d51bf98b9237caf8b8fe3
parent: 9d44fd6bc5f6f6ebfceca6489b7a4d5c9f47ade3
parent: bdb46b295754d61b0b667114b67de3ac589075fc
author: Johann <johannkoenig@google.com>
date: Fri Mar 6 11:04:59 EST 2015
Merge "Cherry pick libyuv VS fix"
--- a/third_party/libyuv/README.libvpx
+++ b/third_party/libyuv/README.libvpx
@@ -13,4 +13,4 @@
in order to encode multiple resolution bit streams.
Local Modifications:
-None.
+cherry pick r1311 'disable nv12 avx2 for vs9/10 that dont support avx2 instructions.'
--- a/third_party/libyuv/source/row_win.cc
+++ b/third_party/libyuv/source/row_win.cc
@@ -1687,6 +1687,7 @@
}
#endif // HAS_I422TOARGBROW_AVX2
+#ifdef HAS_NV12TOARGBROW_AVX2
// 16 pixels.
// 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 ARGB (64 bytes).
__declspec(naked) __declspec(align(16))
@@ -1714,7 +1715,9 @@
ret
}
}
+#endif // HAS_NV12TOARGBROW_AVX2
+#ifdef HAS_NV21TOARGBROW_AVX2
// 16 pixels.
// 8 VU values upsampled to 16 VU, mixed with 16 Y producing 16 ARGB (64 bytes).
__declspec(naked) __declspec(align(16))
@@ -1742,6 +1745,7 @@
ret
}
}
+#endif // HAS_NV21TOARGBROW_AVX2
#ifdef HAS_I422TOBGRAROW_AVX2
// 16 pixels