Merge commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf'

* commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf':
  arm: cosmetics: Fix a misaligned asm operand

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/77/merge
Michael Niedermayer 11 years ago
commit cd4497d8c5
  1. 2
      libavcodec/arm/mlpdsp_armv5te.S

@ -380,7 +380,7 @@ T .hword (78f - 0b) / 2
.macro switch_on_iir_taps mask_minus1, shift_0, shift_8 .macro switch_on_iir_taps mask_minus1, shift_0, shift_8
A ldr pc, [pc, a4, LSL #2] // irorder is in range 0-4 A ldr pc, [pc, a4, LSL #2] // irorder is in range 0-4
T tbh [pc, a4, lsl #1] T tbh [pc, a4, lsl #1]
0: 0:
A .word 0, 60f, 61f, 62f, 63f, 64f A .word 0, 60f, 61f, 62f, 63f, 64f
T .hword (60f - 0b) / 2, (61f - 0b) / 2, (62f - 0b) / 2, (63f - 0b) / 2, (64f - 0b) / 2 T .hword (60f - 0b) / 2, (61f - 0b) / 2, (62f - 0b) / 2, (63f - 0b) / 2, (64f - 0b) / 2

Loading…
Cancel
Save