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/arm/bswap.h | |
| parent | 695f0869395ef3db624dca9d117dd40c74a7c3b1 (diff) | |
| parent | 51a15ed7406f73aed0986de26e16578e55ce0da3 (diff) | |
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/arm/bswap.h')
| -rw-r--r-- | libavutil/arm/bswap.h | 7 |
1 files changed, 0 insertions, 7 deletions
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) { |