[vlc-commits] contrib: rationalize HAVE_NEON and HAVE_ARMV7A

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jan  3 18:11:34 2013 +0100| [ac17dc8ac38f72aa8b01dfe9df011da2b2ba7479] | committer: Rafaël Carré

contrib: rationalize HAVE_NEON and HAVE_ARMV7A

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ac17dc8ac38f72aa8b01dfe9df011da2b2ba7479
---

 contrib/src/ffmpeg/rules.mak   |    5 ++++-
 contrib/src/postproc/rules.mak |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 1e17962..ed64b36 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -52,8 +52,11 @@ endif
 # ARM stuff
 ifeq ($(ARCH),arm)
 FFMPEGCONF += --arch=arm
+ifdef HAVE_NEON
+FFMPEGCONF += --enable-neon
+endif
 ifdef HAVE_ARMV7A
-FFMPEGCONF += --cpu=cortex-a8 --enable-neon
+FFMPEGCONF += --cpu=cortex-a8
 endif
 endif
 
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 2b2c1b9..307de0c 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -27,8 +27,11 @@ endif
 # ARM stuff
 ifeq ($(ARCH),arm)
 POSTPROCCONF += --disable-runtime-cpudetect --arch=arm
+ifdef HAVE_ARMV7A
+POSTPROCCONF += --cpu=cortex-a8
+endif
 ifdef HAVE_NEON
-POSTPROCCONF += --cpu=cortex-a8 --enable-neon
+POSTPROCCONF += --enable-neon
 endif
 endif