RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6 

The overread avoidance fix in cbddee1cca
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

CC: libav-stable@libav.org
This commit is contained in:
Janne Grunau 2014-03-08 11:52:14 +01:00
parent 8c09532672
commit 61985ad72c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/arm/hpeldsp_armv6.S
View File

@ -132,12 +132,11 @@ function ff_put_pixels8_y2_armv6, export=1
uhadd8 r9, r5, r7 uhadd8 r9, r5, r7
eor r11, r5, r7 eor r11, r5, r7
and r10, r10, r12 and r10, r10, r12
ldrc_pre ne, r4, r1, r2 ldr_pre r4, r1, r2
uadd8 r8, r8, r10 uadd8 r8, r8, r10
and r11, r11, r12 and r11, r11, r12
uadd8 r9, r9, r11 uadd8 r9, r9, r11
it ne ldr r5, [r1, #4]
ldrne r5, [r1, #4]
uhadd8 r10, r4, r6 uhadd8 r10, r4, r6
eor r6, r4, r6 eor r6, r4, r6
uhadd8 r11, r5, r7 uhadd8 r11, r5, r7
@ -194,10 +193,9 @@ function ff_put_pixels8_y2_no_rnd_armv6, export=1
1: 1:
subs r3, r3, #2 subs r3, r3, #2
uhadd8 r8, r4, r6 uhadd8 r8, r4, r6
ldrc_pre ne, r4, r1, r2 ldr_pre r4, r1, r2
uhadd8 r9, r5, r7 uhadd8 r9, r5, r7
it ne ldr r5, [r1, #4]
ldrne r5, [r1, #4]
uhadd8 r12, r4, r6 uhadd8 r12, r4, r6
ldrc_pre ne, r6, r1, r2 ldrc_pre ne, r6, r1, r2
uhadd8 r14, r5, r7 uhadd8 r14, r5, r7