summaryrefslogtreecommitdiff
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-01-25 23:16:23 +0200
committerMartin Storsjö <martin@martin.st>2013-01-27 13:17:25 +0200
commit2026eb1408a718c37835eb4b258c63714ab3205e (patch)
treedc7aa8c836462023277653d2081f977000c761a5 /libavcodec/arm
parent96753bd00d6d4046db6818c0aadc21bf2a11d77b (diff)
arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
This makes the plain-armv6 version use the same registers as the armv6t2 version above. This fixes fate-vp8 on plain-armv6 devices. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/vp8dsp_armv6.S16
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