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/arm/h264idct_neon.S | |
| 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/arm/h264idct_neon.S')
| -rw-r--r-- | libavcodec/arm/h264idct_neon.S | 16 |
1 files changed, 8 insertions, 8 deletions
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 |