[vlc-commits] contrib: ffmpeg: add flags for armv6

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri May 10 20:47:13 2013 +0200| [fb56090c19174ebb7f523be64c0d197620e1bee5] | committer: Rafaël Carré

contrib: ffmpeg: add flags for armv6

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

 contrib/bootstrap            |    1 +
 contrib/src/ffmpeg/rules.mak |    3 +++
 2 files changed, 4 insertions(+)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index a455992..6bf7bd5 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -198,6 +198,7 @@ check_android_sdk()
 	add_make "ANDROID_ABI := ${ANDROID_ABI}"
 	[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
 	[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
+	[ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ] && add_make_enabled "HAVE_ARMV6"
 }
 
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 6951933..36b491c 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -60,6 +60,9 @@ endif
 ifdef HAVE_ARMV7A
 FFMPEGCONF += --cpu=cortex-a8
 endif
+ifdef HAVE_ARMV6
+FFMPEGCONF += --cpu=armv6 --disable-neon
+endif
 endif
 
 # MIPS stuff