diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 01:40:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 01:40:29 +0200 |
| commit | 64160ef39216b2d40eb34c13421febe045ddcf8a (patch) | |
| tree | f5d63c19adb037a18baf2689f503f165b9c39aaf /libavcodec/arm/ac3dsp_armv6.S | |
| parent | 72b0c9f55f26049e22bf147ab120173bd1d54cd5 (diff) | |
| parent | fed6c90b68fa00ad399e0b6d51c1e41d0d3730a0 (diff) | |
| download | ffmpeg-64160ef39216b2d40eb34c13421febe045ddcf8a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: remove some stray comments from AVCodec declarations
cosmetics: fix indentation/alignment in AVCodec declarations
arm: Avoid using the movw instruction needlessly
Move an int64_t down in MpegEncContext
Conflicts:
libavcodec/arm/ac3dsp_armv6.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/ac3dsp_armv6.S')
| -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 615baf94e0..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] - ldr 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 |