diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 22:12:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 22:43:09 +0200 |
| commit | 5eb353e0cd62ad212634c14e4b863554c0bc6161 (patch) | |
| tree | 0f53c933b7a61bf14553c3ab8abb8226bd9c23bb /libavcodec/arm/ac3dsp_armv6.S | |
| parent | 23eeffcd48a15e73fb2649b712870b6d101c5471 (diff) | |
| parent | 3893feeccdf754057fc7c7ac711ae876733f2f33 (diff) | |
| download | ffmpeg-5eb353e0cd62ad212634c14e4b863554c0bc6161.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
opt/eval: Include mathematics.h for NAN/INFINITY
mathematics: Don't use division by zero in NAN/INFINITY macros
wma: Lower the maximum number of channels to 2
x86: cpu: clean up check for cpuid instruction support
ARM: generate position independent code to access data symbols
Conflicts:
libavutil/opt.c
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 7e2f40edf0..f6f297a532 100644 --- a/libavcodec/arm/ac3dsp_armv6.S +++ b/libavcodec/arm/ac3dsp_armv6.S @@ -26,8 +26,8 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 beq 4f push {r4-r11,lr} add r5, sp, #40 - movrel r4, X(ff_ac3_bin_to_band_tab) - movrel lr, X(ff_ac3_band_start_tab) + movrelx r4, X(ff_ac3_bin_to_band_tab), r11 + movrelx lr, X(ff_ac3_band_start_tab) ldm r5, {r5-r7} ldrb r4, [r4, r2] add r1, r1, r2, lsl #1 @ psd + start |