diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-21 14:25:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-21 14:44:32 +0200 |
| commit | 406cdddbdd229cead581eb1c7b978a2c59453b24 (patch) | |
| tree | 0c36c4c2fcafb618ae80074a9a1c07a06872a91f /libavcodec/arm | |
| parent | 9543cd593ed8249e9885598fc53de163c9d4e2d3 (diff) | |
| parent | e52e4fe10d96da4ed26e2acbe3c1ab69485ed75d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: add forgotten ;
matroskadec: fix a sanity check.
matroskadec: only return corrupt packets that actually contain data
lavf: zero data/size of the packet passed to read_packet().
ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
ARM: align PIC offset pools to 4 bytes
ARM: swap source operands in some add instructions
configure: update tms470 detection for latest version
lavf probe: prevent codec probe with no data at all seen
motion_est: fix use of inline on extern functions
Conflicts:
libavcodec/motion_est_template.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/ac3dsp_armv6.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_arm.S | 4 | ||||
| -rw-r--r-- | libavcodec/arm/vp8_armv6.S | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/arm/ac3dsp_armv6.S b/libavcodec/arm/ac3dsp_armv6.S index f6f297a532..2028d0b89f 100644 --- a/libavcodec/arm/ac3dsp_armv6.S +++ b/libavcodec/arm/ac3dsp_armv6.S @@ -32,7 +32,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 ldrb r4, [r4, r2] add r1, r1, r2, lsl #1 @ psd + start add r0, r0, r4, lsl #1 @ mask + band - add r4, lr, r4 + add r4, r4, lr add r7, r7, r2 @ bap + start 1: ldrsh r9, [r0], #2 @ mask[band] diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S index 3f0d07155f..92a37571c9 100644 --- a/libavcodec/arm/dsputil_arm.S +++ b/libavcodec/arm/dsputil_arm.S @@ -632,7 +632,7 @@ function ff_add_pixels_clamped_arm, export=1 ldrsh r7, [r0, #2] and r6, r4, #0xFF and r8, r4, #0xFF00 - add r6, r5, r6 + add r6, r6, r5 add r8, r7, r8, lsr #8 mvn r5, r5 mvn r7, r7 @@ -674,7 +674,7 @@ function ff_add_pixels_clamped_arm, export=1 ldrsh r7, [r0, #10] and r6, r4, #0xFF and r8, r4, #0xFF00 - add r6, r5, r6 + add r6, r6, r5 add r8, r7, r8, lsr #8 mvn r5, r5 mvn r7, r7 diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S index 532e40996d..e7d25a45c1 100644 --- a/libavcodec/arm/vp8_armv6.S +++ b/libavcodec/arm/vp8_armv6.S @@ -88,7 +88,7 @@ function ff_decode_block_coeffs_armv6, export=1 add r4, r3, r3, lsl #5 sxth r12, r11 - add r4, r2, r4 + add r4, r4, r2 adds r6, r6, r9 add r4, r4, #11 lsl r8, r8, r9 @@ -138,7 +138,7 @@ A orrcs r8, r8, r10, lsl r6 2: add r4, r3, r3, lsl #5 cmp r3, #16 - add r4, r2, r4 + add r4, r4, r2 pkhtb r11, r11, r11, asr #16 bne 0b b 6b @@ -226,7 +226,7 @@ A orrcs r8, r8, r10, lsl r6 ldr r1, [sp, #4] 4: add r4, r3, r3, lsl #5 - add r4, r2, r4 + add r4, r4, r2 add r4, r4, #22 rac_get_128 r5, r6, r7, r8, r9, r10 it ge |