diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-05 21:34:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-05 21:35:30 +0100 |
| commit | a74bab7079d7a6d0a6c7859dcc35365c32795674 (patch) | |
| tree | ecd3ebb6d41e74d173034a5104e4590c2797592c /libavutil/arm/asm.S | |
| parent | 146b476ba0c99a45caae8559a2e905cbbb79a35b (diff) | |
| parent | cbddee1cca0ebd01e8c5aa694d31228eb4de4b41 (diff) | |
| download | ffmpeg-a74bab7079d7a6d0a6c7859dcc35365c32795674.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: hpeldsp: prevent overreads in armv6 asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/asm.S')
| -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 2ac2c2bfc4..08669f043c 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -216,6 +216,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 |