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/vp8_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/vp8_armv6.S')
-rw-r--r-- | libavcodec/arm/vp8_armv6.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S index 1412f43ad3..532e40996d 100644 --- a/libavcodec/arm/vp8_armv6.S +++ b/libavcodec/arm/vp8_armv6.S @@ -65,7 +65,7 @@ T orrcs \cw, \cw, \t1 function ff_decode_block_coeffs_armv6, export=1 push {r0,r1,r4-r11,lr} - movrel lr, X(ff_vp56_norm_shift) + movrelx lr, X(ff_vp56_norm_shift) ldrd r4, r5, [sp, #44] @ token_prob, qmul cmp r3, #0 ldr r11, [r5] @@ -206,7 +206,7 @@ A orrcs r8, r8, r10, lsl r6 mov r9, #8 it ge addge r12, r12, #1 - movrel r4, X(ff_vp8_dct_cat_prob) + movrelx r4, X(ff_vp8_dct_cat_prob), r1 lsl r9, r9, r12 ldr r4, [r4, r12, lsl #2] add r12, r9, #3 |