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 /libavcodec/arm/dsputil_arm.S | |
| 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 'libavcodec/arm/dsputil_arm.S')
| -rw-r--r-- | libavcodec/arm/dsputil_arm.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S index 92a37571c9..d665ab3d20 100644 --- a/libavcodec/arm/dsputil_arm.S +++ b/libavcodec/arm/dsputil_arm.S @@ -22,8 +22,6 @@ #include "config.h" #include "libavutil/arm/asm.S" - preserve8 - #if HAVE_ARMV5TE function ff_prefetch_arm, export=1 subs r2, r2, #1 |