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/mpegvideo_armv5te_s.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/mpegvideo_armv5te_s.S')
| -rw-r--r-- | libavcodec/arm/mpegvideo_armv5te_s.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/mpegvideo_armv5te_s.S b/libavcodec/arm/mpegvideo_armv5te_s.S index 8f9dd42b22..8687d6b31c 100644 --- a/libavcodec/arm/mpegvideo_armv5te_s.S +++ b/libavcodec/arm/mpegvideo_armv5te_s.S @@ -61,9 +61,9 @@ function ff_dct_unquantize_h263_armv5te, export=1 mov ip, #0 subs r3, r3, #2 ble 2f - ldrd r4, [r0, #0] + ldrd r4, r5, [r0, #0] 1: - ldrd r6, [r0, #8] + ldrd r6, r7, [r0, #8] dequant_t r9, r4, r1, r2, r9 dequant_t lr, r5, r1, r2, lr @@ -87,7 +87,7 @@ function ff_dct_unquantize_h263_armv5te, export=1 subs r3, r3, #8 it gt - ldrdgt r4, [r0, #0] /* load data early to avoid load/use pipeline stall */ + ldrdgt r4, r5, [r0, #0] /* load data early to avoid load/use pipeline stall */ bgt 1b adds r3, r3, #2 |