summaryrefslogtreecommitdiff
path: root/libavcodec/arm/h264idct_neon.S
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-12-30 03:13:52 +0000
committerMåns Rullgård <mans@mansr.com>2008-12-30 03:13:52 +0000
commit172a39d13c77bda27ac77535d1df45f85b751fcb (patch)
treedecec1efc808e094aa37f44bb94d6c43da57de16 /libavcodec/arm/h264idct_neon.S
parent2e35e68434352d44ea133b9fa0f623c87c6a95b6 (diff)
ARM: work around linker bug with movw/movt relocations in shared libs
Originally committed as revision 16395 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm/h264idct_neon.S')
-rw-r--r--libavcodec/arm/h264idct_neon.S9
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S
index 7f1c8eb8d0..6527390022 100644
--- a/libavcodec/arm/h264idct_neon.S
+++ b/libavcodec/arm/h264idct_neon.S
@@ -103,8 +103,7 @@ function ff_h264_idct_add16_neon, export=1
mov r1, r2
mov r2, r3
ldr r6, [sp, #24]
- movw r7, #:lower16:scan8
- movt r7, #:upper16:scan8
+ movrel r7, scan8
mov ip, #16
1: ldrb r8, [r7], #1
ldr r0, [r5], #4
@@ -131,8 +130,7 @@ function ff_h264_idct_add16intra_neon, export=1
mov r1, r2
mov r2, r3
ldr r6, [sp, #24]
- movw r7, #:lower16:scan8
- movt r7, #:upper16:scan8
+ movrel r7, scan8
mov ip, #16
1: ldrb r8, [r7], #1
ldr r0, [r5], #4
@@ -157,8 +155,7 @@ function ff_h264_idct_add8_neon, export=1
add r1, r2, #16*32
mov r2, r3
ldr r6, [sp, #32]
- movw r7, #:lower16:scan8+16
- movt r7, #:upper16:scan8+16
+ movrel r7, scan8+16
mov ip, #8
1: ldrb r8, [r7], #1
ldr r0, [r5], #4