Skip to content

Commit 753ed11

Browse files
committed
enc_neon.c: fix aarch64 compilation w/gcc < 8.5.0
Fixes: dsp/enc_neon.c:1192:11: warning: implicit declaration of function 'vld1_u8_x2'; did you mean 'vld1_u32'? [-Wimplicit-function-declaration] inner = vld1_u8_x2(top); ^~~~~~~~~~ vld1_u32 Change-Id: I8d0175561efd69bc9614a68dca1d0fc19cdf91be
1 parent 0cd0b7a commit 753ed11

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

src/dsp/enc_neon.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,16 @@ static int Quantize2Blocks_NEON(int16_t in[32], int16_t out[32],
945945
vst1q_u8(dst, r); \
946946
} while (0)
947947

948+
static WEBP_INLINE uint8x8x2_t Vld1U8x2(const uint8_t* ptr) {
949+
#if LOCAL_CLANG_PREREQ(3, 4) || LOCAL_GCC_PREREQ(8, 5) || defined(_MSC_VER)
950+
return vld1_u8_x2(ptr);
951+
#else
952+
uint8x8x2_t res;
953+
INIT_VECTOR2(res, vld1_u8(ptr + 0 * 8), vld1_u8(ptr + 1 * 8));
954+
return res;
955+
#endif
956+
}
957+
948958
static WEBP_INLINE uint8x16x4_t Vld1qU8x4(const uint8_t* ptr) {
949959
#if LOCAL_CLANG_PREREQ(3, 4) || LOCAL_GCC_PREREQ(9, 4) || defined(_MSC_VER)
950960
return vld1q_u8_x4(ptr);
@@ -1179,7 +1189,7 @@ static WEBP_INLINE void TrueMotion_NEON(uint8_t* dst, const uint8_t* left,
11791189

11801190
// Neither left nor top are NULL.
11811191
a = vdupq_n_u16(left[-1]);
1182-
inner = vld1_u8_x2(top);
1192+
inner = Vld1U8x2(top);
11831193

11841194
for (i = 0; i < 4; i++) {
11851195
const uint8x8x4_t outer = vld4_dup_u8(&left[i * 4]);

0 commit comments

Comments
 (0)