OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c09532
)
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
author
Janne Grunau
<janne-libav@jannau.net>
Sat, 8 Mar 2014 10:52:14 +0000
(11:52 +0100)
committer
Janne Grunau
<janne-libav@jannau.net>
Sat, 8 Mar 2014 17:31:57 +0000
(18:31 +0100)
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
libavcodec/arm/hpeldsp_armv6.S
patch
|
blob
|
history
diff --git
a/libavcodec/arm/hpeldsp_armv6.S
b/libavcodec/arm/hpeldsp_armv6.S
index
984e0f0
..
f1abc32
100644
(file)
--- 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
- ldr
c_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
- ldr
c_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