diff options
| author | Martin Aumüller <aumuell@reserv.at> | 2011-05-14 10:10:27 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-05-14 10:38:23 +0200 |
| commit | b1eb7a12047d2ba03990b40f3940db33ea4b0bd6 (patch) | |
| tree | b3ba28d9c21be1c5a74741c183fe7e1abcda99c8 | |
| parent | 9f54e461fecec7a97ec1b97ae4468135ea770609 (diff) | |
| download | ffmpeg-b1eb7a12047d2ba03990b40f3940db33ea4b0bd6.tar.gz | |
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@gentoo.org>.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/arm/ac3dsp_armv6.S | 2 | ||||
| -rw-r--r-- | 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 7f01addbde..8026cb72e6 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 88fa398590..11d3521f8d 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 |