diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 12:43:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 12:44:03 +0200 |
| commit | cd4497d8c5c4dc7b06a2b2509bbdbfa9c6831c62 (patch) | |
| tree | ed2afa16fd931253ef42e9639fac9224f2471442 | |
| parent | 277e5ca6175e5ef39e9387b1707b2c533e79d606 (diff) | |
| parent | fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf (diff) | |
| download | ffmpeg-streaming-cd4497d8c5c4dc7b06a2b2509bbdbfa9c6831c62.zip ffmpeg-streaming-cd4497d8c5c4dc7b06a2b2509bbdbfa9c6831c62.tar.gz | |
Merge commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf'
* commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf':
arm: cosmetics: Fix a misaligned asm operand
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/mlpdsp_armv5te.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S index 8355cdf..0e15f2b 100644 --- a/libavcodec/arm/mlpdsp_armv5te.S +++ b/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 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: 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 |
