diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 16:28:36 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 16:28:36 +0100 |
commit | 8a4464514fac40988f4d10e6419a8e1632dfba0c (patch) | |
tree | 1ab932999f4b3ed6c77b14f663705828be238b57 /libavcodec | |
parent | 85e94a30eeb97ac73959fa0e330c5c68e31942e6 (diff) | |
parent | 3d67f52f9dcc60cd3a660ea363762575f3779df7 (diff) | |
download | ffmpeg-8a4464514fac40988f4d10e6419a8e1632dfba0c.tar.gz |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
Prepare for 9.2 Release
lavr: call mix_function_init() in ff_audio_mix_set_matrix()
rtpenc_chain: Use the original AVFormatContext for getting payload type
rtp: Make sure the output format pointer is set
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-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 fd254ccc30..4047aabc13 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 |