From 7b0bf45a9267ebdf7daf2215d7fa9570f6e5bf78 Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Fri, 4 Aug 2017 10:17:22 -0400
Subject: [PATCH] android: reactivate neon optimizations

NEON instructions no longer cause a SIGBUS error.

Change-Id: I30e445de66abe2f51c1732e76a88e8a708532776
---
 contrib/src/ffmpeg/rules.mak | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 7578bca85e..f7e02798ad 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -170,14 +170,12 @@ endif
 
 # ARM stuff
 ifeq ($(ARCH),arm)
-# neon causes SIGBUS error on ARM 32 bits
-FFMPEGCONF += --disable-neon
 FFMPEGCONF += --arch=arm
 ifdef HAVE_ARMV7A
 FFMPEGCONF += --cpu=cortex-a8
 endif
 ifdef HAVE_ARMV6
-FFMPEGCONF += --cpu=armv6
+FFMPEGCONF += --cpu=armv6 --disable-neon
 endif
 endif
 
-- 
GitLab