diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 16:47:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 16:47:56 +0100 |
| commit | 2b14344ab36efca915475a91feb744f8f4101cd5 (patch) | |
| tree | 4756159c406422ab206a00924401bc0636f07c11 | |
| parent | f5c0b9aa6f3843d33961981aa16317d05d74e9dc (diff) | |
| parent | 2026eb1408a718c37835eb4b258c63714ab3205e (diff) | |
| download | ffmpeg-2b14344ab36efca915475a91feb744f8f4101cd5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/vp8dsp_armv6.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index dfaba315b1..52077582cd 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -124,14 +124,14 @@ function ff_vp8_luma_dc_wht_armv6, export=1 sbfx r1, r9, #3, #13 sbfx r10, r4, #3, #13 #else - sxth r8, r8 - sxth r7, r7 - sxth r9, r9 - sxth r4, r4 - asr r8, #3 @ block[0][0] - asr r7, #3 @ block[0][1] - asr r9, #3 @ block[0][2] - asr r4, #3 @ block[0][3] + sxth r6, r8 + sxth r12, r7 + sxth r1, r9 + sxth r10, r4 + asr r6, #3 @ block[0][0] + asr r12, #3 @ block[0][1] + asr r1, #3 @ block[0][2] + asr r10, #3 @ block[0][3] #endif strh r6, [r0], #32 |