diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-09-20 21:50:46 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-09-20 21:50:46 +0000 |
| commit | 75c490f467655bf7be664abdde6858c6f8db5f35 (patch) | |
| tree | ecd607190246b39b5c49e84b3d2c21cca746e7ca | |
| parent | 1790d3b330800e8ec6844392aa501fb558ae25e1 (diff) | |
| download | ffmpeg-75c490f467655bf7be664abdde6858c6f8db5f35.tar.gz | |
ARM: disable movw/movt for relocated values on Apple platforms
Apparently Apple platforms do not handle movw/movt relocations
properly, leading to runtime crashes in code using them.
Originally committed as revision 25150 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -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 f364a24f9b..e0507834f2 100644 --- a/libavcodec/arm/asm.S +++ b/libavcodec/arm/asm.S @@ -62,7 +62,7 @@ ELF .type \name, %function .endm .macro movrel rd, val -#if HAVE_ARMV6T2 && !CONFIG_PIC +#if HAVE_ARMV6T2 && !CONFIG_PIC && !defined(__APPLE__) movw \rd, #:lower16:\val movt \rd, #:upper16:\val #else |