diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 00:29:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 00:48:26 +0100 |
| commit | bf90abe1dd51b692a4ebdf466151f0788f2c5ca2 (patch) | |
| tree | addd33719da0d19a3840173fed9c9a6543354561 /libavcodec | |
| parent | 64278039e55ffc88d231a8d760ecc257a120760a (diff) | |
| parent | 5bcbb516f2ff45290ef7995b081762e668693672 (diff) | |
| download | ffmpeg-bf90abe1dd51b692a4ebdf466151f0788f2c5ca2.tar.gz | |
Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'
* commit '5bcbb516f2ff45290ef7995b081762e668693672':
arm: Add X() around all references to extern symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/arm/fmtconvert_neon.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/h264idct_neon.S | 16 | ||||
| -rw-r--r-- | libavcodec/arm/hpeldsp_armv6.S | 4 | ||||
| -rw-r--r-- | libavcodec/arm/mdct_neon.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/mpegvideo_neon.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/videodsp_armv5te.S | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vp8dsp_armv6.S | 16 |
7 files changed, 22 insertions, 22 deletions
diff --git a/libavcodec/arm/fmtconvert_neon.S b/libavcodec/arm/fmtconvert_neon.S index 55d070e01c..4662e280b6 100644 --- a/libavcodec/arm/fmtconvert_neon.S +++ b/libavcodec/arm/fmtconvert_neon.S @@ -70,7 +70,7 @@ function ff_float_to_int16_interleave_neon, export=1 cmp r3, #2 itt lt ldrlt r1, [r1] - blt ff_float_to_int16_neon + blt X(ff_float_to_int16_neon) bne 4f ldr r3, [r1] diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S index 2edeca2cbc..4f68bdb9f5 100644 --- a/libavcodec/arm/h264idct_neon.S +++ b/libavcodec/arm/h264idct_neon.S @@ -113,8 +113,8 @@ function ff_h264_idct_add16_neon, export=1 movne lr, #0 cmp lr, #0 ite ne - adrne lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB - adreq lr, ff_h264_idct_add_neon + CONFIG_THUMB + adrne lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB + adreq lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB blx lr 2: subs ip, ip, #1 add r1, r1, #32 @@ -138,8 +138,8 @@ function ff_h264_idct_add16intra_neon, export=1 cmp r8, #0 ldrsh r8, [r1] iteet ne - adrne lr, ff_h264_idct_add_neon + CONFIG_THUMB - adreq lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB + adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB + adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB cmpeq r8, #0 blxne lr subs ip, ip, #1 @@ -166,8 +166,8 @@ function ff_h264_idct_add8_neon, export=1 cmp r8, #0 ldrsh r8, [r1] iteet ne - adrne lr, ff_h264_idct_add_neon + CONFIG_THUMB - adreq lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB + adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB + adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB cmpeq r8, #0 blxne lr add r12, r12, #1 @@ -388,8 +388,8 @@ function ff_h264_idct8_add4_neon, export=1 movne lr, #0 cmp lr, #0 ite ne - adrne lr, ff_h264_idct8_dc_add_neon + CONFIG_THUMB - adreq lr, ff_h264_idct8_add_neon + CONFIG_THUMB + adrne lr, X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB + adreq lr, X(ff_h264_idct8_add_neon) + CONFIG_THUMB blx lr 2: subs r12, r12, #4 add r1, r1, #128 diff --git a/libavcodec/arm/hpeldsp_armv6.S b/libavcodec/arm/hpeldsp_armv6.S index cd501504da..6e8bff1b50 100644 --- a/libavcodec/arm/hpeldsp_armv6.S +++ b/libavcodec/arm/hpeldsp_armv6.S @@ -23,11 +23,11 @@ .macro call_2x_pixels type, subp function ff_\type\()_pixels16\subp\()_armv6, export=1 push {r0-r3, lr} - bl ff_\type\()_pixels8\subp\()_armv6 + bl X(ff_\type\()_pixels8\subp\()_armv6) pop {r0-r3, lr} add r0, r0, #8 add r1, r1, #8 - b ff_\type\()_pixels8\subp\()_armv6 + b X(ff_\type\()_pixels8\subp\()_armv6) endfunc .endm diff --git a/libavcodec/arm/mdct_neon.S b/libavcodec/arm/mdct_neon.S index e481cd1307..a6952fa571 100644 --- a/libavcodec/arm/mdct_neon.S +++ b/libavcodec/arm/mdct_neon.S @@ -129,7 +129,7 @@ function ff_imdct_calc_neon, export=1 lsl r4, r4, r3 add r1, r1, r4 - bl ff_imdct_half_neon + bl X(ff_imdct_half_neon) add r0, r5, r4, lsl #2 add r1, r5, r4, lsl #1 diff --git a/libavcodec/arm/mpegvideo_neon.S b/libavcodec/arm/mpegvideo_neon.S index e05df8e711..1889d7a912 100644 --- a/libavcodec/arm/mpegvideo_neon.S +++ b/libavcodec/arm/mpegvideo_neon.S @@ -100,7 +100,7 @@ function ff_dct_unquantize_h263_intra_neon, export=1 smulbb r4, r4, r6 2: lsl r0, r3, #1 add r3, r12, #1 - bl ff_dct_unquantize_h263_neon + bl X(ff_dct_unquantize_h263_neon) vmov.16 d0[0], r4 vst1.16 {d0[0]}, [r5] pop {r4-r6,pc} diff --git a/libavcodec/arm/videodsp_armv5te.S b/libavcodec/arm/videodsp_armv5te.S index 48a6c3ba83..4bd365a332 100644 --- a/libavcodec/arm/videodsp_armv5te.S +++ b/libavcodec/arm/videodsp_armv5te.S @@ -26,6 +26,6 @@ function ff_prefetch_arm, export=1 subs r2, r2, #1 pld [r0] add r0, r0, r1 - bne ff_prefetch_arm + bne X(ff_prefetch_arm) bx lr endfunc diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index a14b188b21..032c11dbba 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -359,14 +359,14 @@ endfunc function ff_vp8_idct_dc_add4uv_armv6, export=1 push {r4, lr} - bl ff_vp8_idct_dc_add_armv6 + bl X(ff_vp8_idct_dc_add_armv6) add r0, r0, #4 - bl ff_vp8_idct_dc_add_armv6 + bl X(ff_vp8_idct_dc_add_armv6) add r0, r0, r2, lsl #2 sub r0, r0, #4 - bl ff_vp8_idct_dc_add_armv6 + bl X(ff_vp8_idct_dc_add_armv6) add r0, r0, #4 - bl ff_vp8_idct_dc_add_armv6 + bl X(ff_vp8_idct_dc_add_armv6) pop {r4, pc} endfunc @@ -375,13 +375,13 @@ endfunc function ff_vp8_idct_dc_add4y_armv6, export=1 push {r4, lr} - bl ff_vp8_idct_dc_add_armv6 + bl X(ff_vp8_idct_dc_add_armv6) add r0, r0, #4 - bl ff_vp8_idct_dc_add_armv6 + bl X(ff_vp8_idct_dc_add_armv6) add r0, r0, #4 - bl ff_vp8_idct_dc_add_armv6 + bl X(ff_vp8_idct_dc_add_armv6) add r0, r0, #4 - bl ff_vp8_idct_dc_add_armv6 + bl X(ff_vp8_idct_dc_add_armv6) pop {r4, pc} endfunc |