diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 23:33:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 23:33:06 +0200 |
| commit | ec7ecb88117fd2d086f0be45ded9743c94100ef4 (patch) | |
| tree | 8536e70dd413e0dc1c5cd65dec3c37928ef3b8cc /libavcodec/arm/simple_idct_neon.S | |
| parent | 4c8fc6a2a41d1b8a4d3eb4452bb5d728253273f4 (diff) | |
| parent | 19cf7163c1576e7b03ea33d7bf633e14d7516db8 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
ARM: use =const syntax instead of explicit literal pools
ARM: use standard syntax for all LDRD/STRD instructions
fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
dct-test: allow to compile without HAVE_INLINE_ASM.
x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.
dca: Move tables used outside of dcadec.c to a separate file.
dca: Rename dca.c ---> dcadec.c
x86: h264dsp: Remove unused variable ff_pb_3_1
apetag: change a forgotten return to return 0
Conflicts:
libavcodec/Makefile
libavcodec/dca.c
libavcodec/x86/fft_3dn.c
libavcodec/x86/fft_3dn2.c
libavcodec/x86/fft_mmx.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/simple_idct_neon.S')
| -rw-r--r-- | libavcodec/arm/simple_idct_neon.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/arm/simple_idct_neon.S b/libavcodec/arm/simple_idct_neon.S index 3c048b0d56..a8fc13768e 100644 --- a/libavcodec/arm/simple_idct_neon.S +++ b/libavcodec/arm/simple_idct_neon.S @@ -159,8 +159,8 @@ function idct_col4_neon vmull.s16 q15, d30, w4 /* q15 = W4*(col[0]+(1<<COL_SHIFT-1)/W4)*/ vld1.64 {d8}, [r2,:64], ip /* d5 = col[3] */ - ldrd r4, [r2] - ldrd r6, [r2, #16] + ldrd r4, r5, [r2] + ldrd r6, r7, [r2, #16] orrs r4, r4, r5 idct_col4_top @@ -176,7 +176,7 @@ function idct_col4_neon vadd.i32 q14, q14, q7 1: orrs r6, r6, r7 - ldrd r4, [r2, #16] + ldrd r4, r5, [r2, #16] it eq addeq r2, r2, #16 beq 2f @@ -188,7 +188,7 @@ function idct_col4_neon vmlal.s16 q6, d5, w3 /* q6 += W3 * col[5] */ 2: orrs r4, r4, r5 - ldrd r4, [r2, #16] + ldrd r4, r5, [r2, #16] it eq addeq r2, r2, #16 beq 3f |