diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2014-03-08 14:52:14 +0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-05-10 19:11:50 +0400 |
| commit | 1bd6372cd34935815c0a061adbf3bc68ca68ff73 (patch) | |
| tree | ab2583dddb25ce5e543f502aaa065682f017d008 /libavcodec/arm | |
| parent | 40ffa99dfa39c574d8784a3c4eaf6406198d675d (diff) | |
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.
CC: libav-stable@libav.org
(cherry picked from commit 61985ad72c47bbb668f2d3923bf5c9df83e79323)
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/hpeldsp_armv6.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/arm/hpeldsp_armv6.S b/libavcodec/arm/hpeldsp_armv6.S index 984e0f0e32..f1abc328eb 100644 --- a/libavcodec/arm/hpeldsp_armv6.S +++ b/libavcodec/arm/hpeldsp_armv6.S @@ -132,12 +132,11 @@ function ff_put_pixels8_y2_armv6, export=1 uhadd8 r9, r5, r7 eor r11, r5, r7 and r10, r10, r12 - ldrc_pre ne, r4, r1, r2 + ldr_pre r4, r1, r2 uadd8 r8, r8, r10 and r11, r11, r12 uadd8 r9, r9, r11 - it ne - ldrne r5, [r1, #4] + ldr r5, [r1, #4] uhadd8 r10, r4, r6 eor r6, r4, r6 uhadd8 r11, r5, r7 @@ -194,10 +193,9 @@ function ff_put_pixels8_y2_no_rnd_armv6, export=1 1: subs r3, r3, #2 uhadd8 r8, r4, r6 - ldrc_pre ne, r4, r1, r2 + ldr_pre r4, r1, r2 uhadd8 r9, r5, r7 - it ne - ldrne r5, [r1, #4] + ldr r5, [r1, #4] uhadd8 r12, r4, r6 ldrc_pre ne, r6, r1, r2 uhadd8 r14, r5, r7 |