[FFmpeg-cvslog] arm: properly mark external symbol call
Martin Aumüller
git at videolan.org
Sun May 15 04:53:44 CEST 2011
ffmpeg | branch: master | Martin Aumüller <aumuell at reserv.at> | Sat May 14 10:10:27 2011 +0200| [b1eb7a12047d2ba03990b40f3940db33ea4b0bd6] | committer: Luca Barbato
arm: properly mark external symbol call
Surround memset and ff_vp8_dct_cat_prob by X() in order to fix iOS build
Includes patch by Luca Barbato <lu_zero at gentoo.org>.
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1eb7a12047d2ba03990b40f3940db33ea4b0bd6
---
libavcodec/arm/ac3dsp_armv6.S | 2 +-
libavcodec/arm/vp8_armv6.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/arm/ac3dsp_armv6.S b/libavcodec/arm/ac3dsp_armv6.S
index 7f01add..8026cb7 100644
--- a/libavcodec/arm/ac3dsp_armv6.S
+++ b/libavcodec/arm/ac3dsp_armv6.S
@@ -79,5 +79,5 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
ldr r0, [sp, #12]
mov r1, #0
mov r2, #256
- b memset
+ b X(memset)
endfunc
diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S
index 88fa398..11d3521 100644
--- a/libavcodec/arm/vp8_armv6.S
+++ b/libavcodec/arm/vp8_armv6.S
@@ -180,7 +180,7 @@ function ff_decode_block_coeffs_armv6, export=1
rac_get_prob r5, r6, r7, r8, r0, r9, r10
mov r9, #8
addge r12, r12, #1
- movrel r4, ff_vp8_dct_cat_prob
+ movrel r4, X(ff_vp8_dct_cat_prob)
lsl r9, r9, r12
ldr r4, [r4, r12, lsl #2]
add r12, r9, #3
More information about the ffmpeg-cvslog
mailing list