diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-03 13:34:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-03 13:35:02 +0200 |
| commit | 7e5496fc41810825657e0a21fb5dcc3081ca1c5a (patch) | |
| tree | 7fde66107274ff5ff04526618161a67919d9a0bd /libavutil | |
| parent | 695f0869395ef3db624dca9d117dd40c74a7c3b1 (diff) | |
| parent | 51a15ed7406f73aed0986de26e16578e55ce0da3 (diff) | |
| download | ffmpeg-7e5496fc41810825657e0a21fb5dcc3081ca1c5a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: use numeric ID for Tag_ABI_align_preserved
segment: Pass the interrupt callback on to the chained AVFormatContext, too
ARM: bswap: drop armcc version of av_bswap16()
ARM: set Tag_ABI_align_preserved in all asm files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/asm.S | 9 | ||||
| -rw-r--r-- | libavutil/arm/bswap.h | 7 | ||||
| -rw-r--r-- | libavutil/arm/float_dsp_neon.S | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 449077c1ab..bb7c383875 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -52,14 +52,7 @@ .syntax unified T .thumb - -.macro require8 val=1 -ELF .eabi_attribute 24, \val -.endm - -.macro preserve8 val=1 -ELF .eabi_attribute 25, \val -.endm +ELF .eabi_attribute 25, 1 @ Tag_ABI_align_preserved .macro function name, export=0 .set .Lpic_idx, 0 diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h index fd18e0d221..c10c35fa16 100644 --- a/libavutil/arm/bswap.h +++ b/libavutil/arm/bswap.h @@ -26,13 +26,6 @@ #ifdef __ARMCC_VERSION #if HAVE_ARMV6 -#define av_bswap16 av_bswap16 -static av_always_inline av_const unsigned av_bswap16(unsigned x) -{ - __asm { rev16 x, x } - return x; -} - #define av_bswap32 av_bswap32 static av_always_inline av_const uint32_t av_bswap32(uint32_t x) { diff --git a/libavutil/arm/float_dsp_neon.S b/libavutil/arm/float_dsp_neon.S index 03b164388f..4aa6f838dd 100644 --- a/libavutil/arm/float_dsp_neon.S +++ b/libavutil/arm/float_dsp_neon.S @@ -22,8 +22,6 @@ #include "config.h" #include "asm.S" - preserve8 - function ff_vector_fmul_neon, export=1 subs r3, r3, #8 vld1.32 {d0-d3}, [r1,:128]! |