diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2014-03-08 11:52:14 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2014-03-09 00:31:31 +0100 |
| commit | 0120e480bf0a1257299c8c84416a8814ccfcc73b (patch) | |
| tree | ef4e9b4ef46883559a41a5a915e549c564cccedb | |
| parent | fd2fc130b24cd17239ae09ec6de0347340c1b950 (diff) | |
| download | ffmpeg-0120e480bf0a1257299c8c84416a8814ccfcc73b.tar.gz | |
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.
| -rw-r--r-- | libavcodec/arm/dsputil_armv6.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S index e4f71cb5b6..25074b4311 100644 --- a/libavcodec/arm/dsputil_armv6.S +++ b/libavcodec/arm/dsputil_armv6.S @@ -134,12 +134,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 @@ -196,10 +195,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 |