diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 18:19:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 18:19:21 +0200 |
| commit | 83e8650f7703b47d9762d9ef0e520b67f92b5aba (patch) | |
| tree | 1a22542120bd137455cd54f25c761bc58c06c330 /libavcodec/arm/vc1dsp_neon.S | |
| parent | bcbd7dbce5461ba91ab2179737f916b374572a2e (diff) | |
| parent | 896a5bff64264f4d01ed98eacc97a67260c1e17e (diff) | |
| download | ffmpeg-83e8650f7703b47d9762d9ef0e520b67f92b5aba.tar.gz | |
Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'
* commit '896a5bff64264f4d01ed98eacc97a67260c1e17e':
arm: check if AS supports .dn
Conflicts:
configure
libavcodec/arm/vc1dsp_init_neon.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/vc1dsp_neon.S')
| -rw-r--r-- | libavcodec/arm/vc1dsp_neon.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/arm/vc1dsp_neon.S b/libavcodec/arm/vc1dsp_neon.S index 3fba41fa66..c4f4db9c8e 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 |