diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 08:55:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-27 08:55:24 +0200 |
| commit | b7c6d1ed906453d9fcd3d8ef78f68dae68ae3ed1 (patch) | |
| tree | 9315f8bd1500ea292abdb49f2187b9bcd37cec87 /libavutil/arm/asm.S | |
| parent | 53ec1c811e41807a296934eb142f4aebe787e390 (diff) | |
| parent | be7952b5c3ace9aba4a4121d7bb540ac5257594c (diff) | |
| download | ffmpeg-b7c6d1ed906453d9fcd3d8ef78f68dae68ae3ed1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Only output eabi attributes if building for ELF
fix scalarproduct_and_madd_int16_altivec() for orders > 16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/asm.S')
| -rw-r--r-- | libavutil/arm/asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 6061e47a63..9cdcce9a18 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -291,7 +291,7 @@ T sub \rn, \rn, \rm .endm #if HAVE_VFP_ARGS - .eabi_attribute 28, 1 +ELF .eabi_attribute 28, 1 # define VFP # define NOVFP @ #else |