diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 23:13:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 23:13:13 +0100 |
| commit | 490215cbd70ef3e5f0b7cf544f1980bd6e55042e (patch) | |
| tree | 2c0351923c31d06d98ac9395d2b66f839a57159c /libavcodec/aarch64 | |
| parent | 1859b1de31bdfbe6761b4996dc4d8cf1f8c273cd (diff) | |
| parent | 9c029f67ca82147ddfa83a1546ee1e109e11fbd4 (diff) | |
| download | ffmpeg-490215cbd70ef3e5f0b7cf544f1980bd6e55042e.tar.gz | |
Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'
* commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4':
aarch64: use EXTERN_ASM consistently for exported symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aarch64')
| -rw-r--r-- | libavcodec/aarch64/h264idct_neon.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/aarch64/h264idct_neon.S b/libavcodec/aarch64/h264idct_neon.S index 0c161040a1..04b5a47f04 100644 --- a/libavcodec/aarch64/h264idct_neon.S +++ b/libavcodec/aarch64/h264idct_neon.S @@ -106,8 +106,8 @@ function ff_h264_idct_add16_neon, export=1 mov w9, w3 // stride movrel x7, scan8 mov x10, #16 - movrel x13, ff_h264_idct_dc_add_neon - movrel x14, ff_h264_idct_add_neon + movrel x13, X(ff_h264_idct_dc_add_neon) + movrel x14, X(ff_h264_idct_add_neon) 1: mov w2, w9 ldrb w3, [x7], #1 ldrsw x0, [x5], #4 @@ -133,8 +133,8 @@ function ff_h264_idct_add16intra_neon, export=1 mov w9, w3 // stride movrel x7, scan8 mov x10, #16 - movrel x13, ff_h264_idct_dc_add_neon - movrel x14, ff_h264_idct_add_neon + movrel x13, X(ff_h264_idct_dc_add_neon) + movrel x14, X(ff_h264_idct_add_neon) 1: mov w2, w9 ldrb w3, [x7], #1 ldrsw x0, [x5], #4 @@ -160,8 +160,8 @@ function ff_h264_idct_add8_neon, export=1 add x5, x1, #16*4 // block_offset add x9, x2, #16*32 // block mov w19, w3 // stride - movrel x13, ff_h264_idct_dc_add_neon - movrel x14, ff_h264_idct_add_neon + movrel x13, X(ff_h264_idct_dc_add_neon) + movrel x14, X(ff_h264_idct_add_neon) movrel x7, scan8+16 mov x10, #0 mov x11, #16 @@ -374,8 +374,8 @@ function ff_h264_idct8_add4_neon, export=1 mov w2, w3 movrel x7, scan8 mov w10, #16 - movrel x13, ff_h264_idct8_dc_add_neon - movrel x14, ff_h264_idct8_add_neon + movrel x13, X(ff_h264_idct8_dc_add_neon) + movrel x14, X(ff_h264_idct8_add_neon) 1: ldrb w9, [x7], #4 ldrsw x0, [x5], #16 ldrb w9, [x4, w9, UXTW] |