[SCM] libav/experimental: ARM: disable movw/movt for relocated values on Apple platforms

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:15:59 UTC 2013


The following commit has been merged in the experimental branch:
commit 75c490f467655bf7be664abdde6858c6f8db5f35
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Sep 20 21:50:46 2010 +0000

    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

diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S
index f364a24..e050783 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

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list