summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-10-11 10:15:48 +0000
committerMåns Rullgård <mans@mansr.com>2009-10-11 10:15:48 +0000
commit3e6015cc18d39b38188cd79a47cb8b374d5d5c68 (patch)
treea1325a003f609ef038014da58e607faab932c342 /libavcodec
parent1fce58c2fc0348bfb906b11995af4fe38faebd8d (diff)
ARM: simplify movrel definition as CONFIG_PIC is now set for shared libs
Originally committed as revision 20204 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/arm/asm.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S
index 0fbd641dc3..1ee431d94e 100644
--- a/libavcodec/arm/asm.S
+++ b/libavcodec/arm/asm.S
@@ -45,7 +45,7 @@ ELF .type \name, %function
.endm
.macro movrel rd, val
-#if HAVE_ARMV6T2 && !CONFIG_SHARED && !CONFIG_PIC
+#if HAVE_ARMV6T2 && !CONFIG_PIC
movw \rd, #:lower16:\val
movt \rd, #:upper16:\val
#else