[FFmpeg-devel] [PATCH] arm: only enable setend on ARMv6

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Thu Jun 4 23:17:45 CEST 2015


Without this check it causes SIGILL crashes on ARMv5.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 libavutil/arm/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c
index f1683e8..ac42a05 100644
--- a/libavutil/arm/cpu.c
+++ b/libavutil/arm/cpu.c
@@ -128,7 +128,7 @@ int ff_get_cpu_flags_arm(void)
        trickle down. */
     if (flags & (AV_CPU_FLAG_VFPV3 | AV_CPU_FLAG_NEON))
         flags |= AV_CPU_FLAG_ARMV6T2;
-    else
+    else if (flags & AV_CPU_FLAG_ARMV6)
     /* Some functions use the 'setend' instruction which is deprecated on ARMv8
      * and serializing on some ARMv7 cores. This ensures such functions
      * are only enabled on ARMv6. */
-- 
2.1.4


More information about the ffmpeg-devel mailing list