From 82a83c4fe0a3dd249f847bd51c2005d8d4da4074 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Wed, 7 May 2014 10:22:18 +0300 Subject: [PATCH] arm: Use a correct neon vector type for 64 bit integers This fixes building with MSVC. Change-Id: I763ba8855c8083d82c8b477d3a297e310e93a335 --- vp8/common/arm/neon/variance_neon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vp8/common/arm/neon/variance_neon.c b/vp8/common/arm/neon/variance_neon.c index 3e25f7d..b6b484f 100644 --- a/vp8/common/arm/neon/variance_neon.c +++ b/vp8/common/arm/neon/variance_neon.c @@ -19,7 +19,7 @@ unsigned int vp8_variance16x16_neon( int i; int16x4_t d22s16, d23s16, d24s16, d25s16, d26s16, d27s16, d28s16, d29s16; uint32x2_t d0u32, d10u32; - int64_t d0s64, d1s64; + int64x1_t d0s64, d1s64; uint8x16_t q0u8, q1u8, q2u8, q3u8; uint16x8_t q11u16, q12u16, q13u16, q14u16; int32x4_t q8s32, q9s32, q10s32; @@ -98,7 +98,7 @@ unsigned int vp8_variance16x8_neon( int i; int16x4_t d22s16, d23s16, d24s16, d25s16, d26s16, d27s16, d28s16, d29s16; uint32x2_t d0u32, d10u32; - int64_t d0s64, d1s64; + int64x1_t d0s64, d1s64; uint8x16_t q0u8, q1u8, q2u8, q3u8; uint16x8_t q11u16, q12u16, q13u16, q14u16; int32x4_t q8s32, q9s32, q10s32; @@ -178,7 +178,7 @@ unsigned int vp8_variance8x16_neon( uint8x8_t d0u8, d2u8, d4u8, d6u8; int16x4_t d22s16, d23s16, d24s16, d25s16; uint32x2_t d0u32, d10u32; - int64_t d0s64, d1s64; + int64x1_t d0s64, d1s64; uint16x8_t q11u16, q12u16; int32x4_t q8s32, q9s32, q10s32; int64x2_t q0s64, q1s64, q5s64; @@ -243,7 +243,7 @@ unsigned int vp8_variance8x8_neon( uint8x8_t d0u8, d1u8, d2u8, d3u8, d4u8, d5u8, d6u8, d7u8; int16x4_t d22s16, d23s16, d24s16, d25s16, d26s16, d27s16, d28s16, d29s16; uint32x2_t d0u32, d10u32; - int64_t d0s64, d1s64; + int64x1_t d0s64, d1s64; uint16x8_t q11u16, q12u16, q13u16, q14u16; int32x4_t q8s32, q9s32, q10s32; int64x2_t q0s64, q1s64, q5s64; -- 2.7.4