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/h264dsp_neon.S | |
| parent | 4c8fc6a2a41d1b8a4d3eb4452bb5d728253273f4 (diff) | |
| parent | 19cf7163c1576e7b03ea33d7bf633e14d7516db8 (diff) | |
| download | ffmpeg-ec7ecb88117fd2d086f0be45ded9743c94100ef4.tar.gz | |
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/h264dsp_neon.S')
| -rw-r--r-- | libavcodec/arm/h264dsp_neon.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/arm/h264dsp_neon.S b/libavcodec/arm/h264dsp_neon.S index 341863ef40..be0d2ec0bb 100644 --- a/libavcodec/arm/h264dsp_neon.S +++ b/libavcodec/arm/h264dsp_neon.S @@ -886,7 +886,7 @@ T mov sp, r0 mov r12, #8 vpush {d8-d15} bl put_h264_qpel8_h_lowpass_neon - ldrd r0, [r11], #8 + ldrd r0, r1, [r11], #8 mov r3, r2 add r12, sp, #64 sub r1, r1, r2, lsl #1 @@ -913,7 +913,7 @@ T mov sp, r0 vpush {d8-d15} bl put_h264_qpel8_h_lowpass_neon mov r4, r0 - ldrd r0, [r11], #8 + ldrd r0, r1, [r11], #8 sub r1, r1, r2, lsl #1 sub r1, r1, #2 mov r3, r2 @@ -958,7 +958,7 @@ T mov sp, r0 vpush {d8-d15} bl put_h264_qpel8_v_lowpass_neon mov r4, r0 - ldrd r0, [r11], #8 + ldrd r0, r1, [r11], #8 sub r1, r1, r3, lsl #1 sub r1, r1, #2 sub r2, r4, #64 @@ -1071,7 +1071,7 @@ T mov sp, r0 mov r3, #16 vpush {d8-d15} bl put_h264_qpel16_h_lowpass_neon - ldrd r0, [r11], #8 + ldrd r0, r1, [r11], #8 mov r3, r2 add r12, sp, #64 sub r1, r1, r2, lsl #1 @@ -1096,7 +1096,7 @@ T mov sp, r0 vpush {d8-d15} bl put_h264_qpel16_h_lowpass_neon_packed mov r4, r0 - ldrd r0, [r11], #8 + ldrd r0, r1, [r11], #8 sub r1, r1, r2, lsl #1 sub r1, r1, #2 mov r3, r2 @@ -1139,7 +1139,7 @@ T mov sp, r0 vpush {d8-d15} bl put_h264_qpel16_v_lowpass_neon_packed mov r4, r0 - ldrd r0, [r11], #8 + ldrd r0, r1, [r11], #8 sub r1, r1, r3, lsl #1 sub r1, r1, #2 mov r2, r3 |