From 896a5bff64264f4d01ed98eacc97a67260c1e17e Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Thu, 29 May 2014 14:21:05 +0200 Subject: arm: check if AS supports .dn Move the GNU as check before the arch specific asm checks since the .dn check requires gas compatible assembler. Disable the VC-1 motion compensation NEON asm which is the only part using that directive. The integrated assembler in the upcoming clang 3.5 does not support .dn/.qn without plans to change that. Too much effort to implement it while it is rarely used. http://llvm.org/bugs/show_bug.cgi?id=18199. --- libavcodec/arm/vc1dsp_neon.S | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/arm/vc1dsp_neon.S') diff --git a/libavcodec/arm/vc1dsp_neon.S b/libavcodec/arm/vc1dsp_neon.S index d1b24cfc04..fa87eded61 100644 --- a/libavcodec/arm/vc1dsp_neon.S +++ b/libavcodec/arm/vc1dsp_neon.S @@ -24,6 +24,8 @@ #include "libavutil/arm/asm.S" #include "neon.S" +#include "config.h" + @ Transpose rows into columns of a matrix of 16-bit elements. For 4x4, pass @ double-word registers, for 8x4, pass quad-word registers. .macro transpose16 r0, r1, r2, r3 @@ -661,6 +663,7 @@ function ff_vc1_inv_trans_4x4_neon, export=1 bx lr endfunc +#if HAVE_AS_DN_DIRECTIVE @ The absolute value of multiplication constants from vc1_mspel_filter and vc1_mspel_{ver,hor}_filter_16bits. @ The sign is embedded in the code below that carries out the multiplication (mspel_filter{,.16}). #define MSPEL_MODE_1_MUL_CONSTANTS 4 53 18 3 @@ -984,6 +987,7 @@ PUT_VC1_MSPEL_MC_V_ONLY(2) PUT_VC1_MSPEL_MC_V_ONLY(3) #undef PUT_VC1_MSPEL_MC_V_ONLY +#endif function ff_put_pixels8x8_neon, export=1 vld1.64 {d0}, [r1], r2 -- cgit v1.2.3