diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 03:59:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 03:59:18 +0100 |
| commit | f1f06710c4378029935d155ecd08fa3f38d6fece (patch) | |
| tree | 08680370dafe502932c9d120690489b4621d8e7e /libavutil | |
| parent | 993c2a256dd9bda240883f629b468675644b706c (diff) | |
| parent | 460b9482834e248fa5861d2d88bf9f19ec313d68 (diff) | |
| download | ffmpeg-f1f06710c4378029935d155ecd08fa3f38d6fece.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
arm: hpeldsp: prevent overreads in armv6 asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/asm.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 6061e47a63..94229da839 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -212,6 +212,13 @@ T ldr \rt, [\rn] T add \rn, \rn, \rm .endm +.macro ldrc_pre cc, rt, rn, rm:vararg +A ldr\cc \rt, [\rn, \rm]! +T itt \cc +T add\cc \rn, \rn, \rm +T ldr\cc \rt, [\rn] +.endm + .macro ldrd_reg rt, rt2, rn, rm A ldrd \rt, \rt2, [\rn, \rm] T add \rt, \rn, \rm |