contrib: ffmpeg: add flags for armv6

diff --git a/contrib/bootstrap b/contrib/bootstrap
index a455992abac93ae1a5b9beb671cbe23644bf3eb9..6bf7bd5520e0b40d32b436973322144ffc2032e0 100755 (executable)
--- 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 69519336b45a6ec7cc19f1cfd9d9596c602ad960..36b491c6d46ea601d86309f9d5360dff95033a01 100644 (file)
--- 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