diff options
| author | Måns Rullgård <mans@mansr.com> | 2011-08-01 20:21:04 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-08-03 11:56:58 +0300 |
| commit | 9a83adaf346bc5e38183427b2bd11084c11d1c8b (patch) | |
| tree | 64ed1ad768bc33fac37d7ba9db48d14e138aa388 /libavcodec | |
| parent | d0a2f0af9db7e84f1274c4ccf5d54022527664e2 (diff) | |
| download | ffmpeg-9a83adaf346bc5e38183427b2bd11084c11d1c8b.tar.gz | |
arm: Avoid using the movw instruction needlessly
This fixes building for ARM11 without Thumb2.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/arm/ac3dsp_armv6.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/ac3dsp_armv6.S b/libavcodec/arm/ac3dsp_armv6.S index d3058ffcec..b6aee867b3 100644 --- a/libavcodec/arm/ac3dsp_armv6.S +++ b/libavcodec/arm/ac3dsp_armv6.S @@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 ldrb r10, [r4], #1 1: ldrsh r9, [r0], #2 @ mask[band] - movw r8, #0x1fe0 + mov r8, #0xff0 sub r9, r9, r12 @ - snr_offset mov r11, r10 ldrb r10, [r4], #1 @ band_start_tab[band++] @@ -45,7 +45,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 it lt movlt r9, #0 cmp r10, r3 @ - end - and r9, r9, r8 @ & 0x1fe0 + and r9, r9, r8, lsl #1 @ & 0x1fe0 ite gt subgt r8, r3, r11 suble r8, r10, r11 |