ref: 0ca6e4ac35b1bc9fec08171c7caa648db9567b89
parent: f7cf05cfe02b9c60b9eb3037a0d0eade07ef55d2
parent: 1220b49c8975d9b2326767e076436e50310de78b
author: James Zern <[email protected]>
date: Tue Sep 16 14:44:49 EDT 2014
Merge "arm: Fix building vp8_mse16x16_neon.c with MSVC"
--- a/vp8/encoder/arm/neon/vp8_mse16x16_neon.c
+++ b/vp8/encoder/arm/neon/vp8_mse16x16_neon.c
@@ -18,7 +18,7 @@
unsigned int *sse) {
int i;
int16x4_t d22s16, d23s16, d24s16, d25s16, d26s16, d27s16, d28s16, d29s16;
- int64_t d0s64;
+ int64x1_t d0s64;
uint8x16_t q0u8, q1u8, q2u8, q3u8;
int32x4_t q7s32, q8s32, q9s32, q10s32;
uint16x8_t q11u16, q12u16, q13u16, q14u16;
@@ -82,7 +82,7 @@
const unsigned char *ref_ptr,
int recon_stride) {
int16x4_t d22s16, d24s16, d26s16, d28s16;
- int64_t d0s64;
+ int64x1_t d0s64;
uint8x8_t d0u8, d1u8, d2u8, d3u8, d4u8, d5u8, d6u8, d7u8;
int32x4_t q7s32, q8s32, q9s32, q10s32;
uint16x8_t q11u16, q12u16, q13u16, q14u16;