From 424534537a249dcf913e02560303f6afca423489 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 18 Nov 2015 11:08:22 +0100 Subject: [PATCH] arm: do not fill mc_weight*_neon tabs for HIGH_BIT_DEPTH The asm is only for 8-bit and function prototypes reflect that. Avoids numerous warnings with --bit-depth=9/10. --- common/arm/mc-c.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/arm/mc-c.c b/common/arm/mc-c.c index 0ead7b02..c3eec46e 100644 --- a/common/arm/mc-c.c +++ b/common/arm/mc-c.c @@ -67,6 +67,7 @@ void x264_store_interleave_chroma_neon( pixel *dst, intptr_t i_dst, pixel *srcu, void x264_load_deinterleave_chroma_fdec_neon( pixel *dst, pixel *src, intptr_t i_src, int height ); void x264_load_deinterleave_chroma_fenc_neon( pixel *dst, pixel *src, intptr_t i_src, int height ); +#if !HIGH_BIT_DEPTH #define MC_WEIGHT(func)\ void x264_mc_weight_w20##func##_neon( uint8_t *, intptr_t, uint8_t *, intptr_t, const x264_weight_t *, int );\ void x264_mc_weight_w16##func##_neon( uint8_t *, intptr_t, uint8_t *, intptr_t, const x264_weight_t *, int );\ @@ -87,6 +88,7 @@ MC_WEIGHT() MC_WEIGHT(_nodenom) MC_WEIGHT(_offsetadd) MC_WEIGHT(_offsetsub) +#endif void x264_mc_copy_w4_neon ( uint8_t *, intptr_t, uint8_t *, intptr_t, int ); void x264_mc_copy_w8_neon ( uint8_t *, intptr_t, uint8_t *, intptr_t, int ); -- 2.39.2