diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 18:48:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-10 18:48:51 +0100 |
| commit | ad4963a944644d390a813755ded833ba4a2ca367 (patch) | |
| tree | 57b0e196784d6de0d423d3dc4bb0a992f784f29b /libavcodec/arm/dsputil_armv6.S | |
| parent | 5640ea43d7202e6bc6bc032079f66456323d1008 (diff) | |
| parent | 0120e480bf0a1257299c8c84416a8814ccfcc73b (diff) | |
| download | ffmpeg-ad4963a944644d390a813755ded833ba4a2ca367.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8:
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
arm: hpeldsp: prevent overreads in armv6 asm
lagarith: reallocate rgb_planes when needed
lagarith: avoid infinite loop in lag_rac_refill()
Conflicts:
libavcodec/lagarith.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dsputil_armv6.S')
| -rw-r--r-- | libavcodec/arm/dsputil_armv6.S | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S index 1adedf7b8f..c595c4a36a 100644 --- a/libavcodec/arm/dsputil_armv6.S +++ b/libavcodec/arm/dsputil_armv6.S @@ -146,10 +146,11 @@ function ff_put_pixels8_y2_armv6, export=1 eor r7, r5, r7 uadd8 r10, r10, r6 and r7, r7, r12 - ldr_pre r6, r1, r2 + ldrc_pre ne, r6, r1, r2 uadd8 r11, r11, r7 strd_post r8, r9, r0, r2 - ldr r7, [r1, #4] + it ne + ldrne r7, [r1, #4] strd_post r10, r11, r0, r2 bne 1b @@ -198,9 +199,10 @@ function ff_put_pixels8_y2_no_rnd_armv6, export=1 uhadd8 r9, r5, r7 ldr r5, [r1, #4] uhadd8 r12, r4, r6 - ldr_pre r6, r1, r2 + ldrc_pre ne, r6, r1, r2 uhadd8 r14, r5, r7 - ldr r7, [r1, #4] + it ne + ldrne r7, [r1, #4] stm r0, {r8,r9} add r0, r0, r2 stm r0, {r12,r14} |