Merge "arm: Add a no-op define of __builtin_prefetch for MSVC"

vp8/common/arm/neon/sixtappredict_neon.c

@@ -10,6 +10,10 @@
 
 #include <arm_neon.h>
 
+#ifdef _MSC_VER
+#define __builtin_prefetch(x)
+#endif
+
 static const int8_t vp8_sub_pel_filters[8][8] = {
     {0,  0,  128,   0,   0, 0, 0, 0},  /* note that 1/8 pel positionyys are */
     {0, -6,  123,  12,  -1, 0, 0, 0},  /*    just as per alpha -0.5 bicubic */

vp8/common/arm/neon/variance_neon.c

@@ -10,6 +10,10 @@
 
 #include <arm_neon.h>
 
+#ifdef _MSC_VER
+#define __builtin_prefetch(x)
+#endif
+
 unsigned int vp8_variance16x16_neon(
         const unsigned char *src_ptr,
         int source_stride,