diff options
author | Måns Rullgård <mans@mansr.com> | 2009-09-16 19:20:48 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2009-09-16 19:20:48 +0000 |
commit | d25130eb236ac30698ce1c92f27b3480ba1e0718 (patch) | |
tree | 64dabb91eaed3d6c3d5f46ab93de207b6aac0259 /libavcodec/arm/asm.S | |
parent | ebd3e99de9d699dd5a79bbe182c10d24f01c90e8 (diff) | |
download | ffmpeg-d25130eb236ac30698ce1c92f27b3480ba1e0718.tar.gz |
ARM: do not use movw/movt for relocatable values with PIC
Originally committed as revision 19886 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm/asm.S')
-rw-r--r-- | libavcodec/arm/asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S index 02f90152d7..06006730da 100644 --- a/libavcodec/arm/asm.S +++ b/libavcodec/arm/asm.S @@ -44,7 +44,7 @@ ELF .type \name, %function .endm .macro movrel rd, val -#if HAVE_ARMV6T2 && !CONFIG_SHARED +#if HAVE_ARMV6T2 && !CONFIG_SHARED && !CONFIG_PIC movw \rd, #:lower16:\val movt \rd, #:upper16:\val #else |