diff --git a/README.md b/README.md index 7544f67..24c5547 100755 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Instructions * To update submodules and libraries you can use ./init_update_libs.sh command * Find the executable binary in build directory. * If you want to use FONTCONFIG then you need to specify your custom fontconfig config file (e.g - "FONTCONFIG_FILE=/sdcard/fonts.conf ./ffmpeg --version", where /sdcard/fonts.conf is location of your FONTCONFIG configuration file). -* You can also download [prebuilt-binaries.zip](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.1/prebuilt-binaries.zip) [prebuilt-binaries.tar.gz](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.1/prebuilt-binaries.tar.gz) here. +* You can also download [prebuilt-binaries.zip](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.2/prebuilt-binaries.zip) [prebuilt-binaries.tar.gz](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.2/prebuilt-binaries.tar.gz) here. License ---- diff --git a/abi_settings.sh b/abi_settings.sh index 590aa8e..766634a 100755 --- a/abi_settings.sh +++ b/abi_settings.sh @@ -9,22 +9,18 @@ case $1 in NDK_ABI='arm' NDK_TOOLCHAIN_ABI='arm-linux-androideabi' NDK_CROSS_PREFIX="${NDK_TOOLCHAIN_ABI}" - CFLAGS="$CFLAGS -march=armv7-a" - CFLAGS_LIBS="$CFLAGS_LIBS -mcpu=cortex-a8 -marm -mfloat-abi=softfp" ;; armeabi-v7a-neon) NDK_ABI='arm' NDK_TOOLCHAIN_ABI='arm-linux-androideabi' NDK_CROSS_PREFIX="${NDK_TOOLCHAIN_ABI}" - CFLAGS="$CFLAGS -march=armv7-a -mfpu=neon" - CFLAGS_LIBS="$CFLAGS_LIBS -mcpu=cortex-a8 -marm -mfloat-abi=softfp -mfpu=neon" + CFLAGS="${CFLAGS} -mfpu=neon" ;; x86) NDK_ABI='x86' NDK_TOOLCHAIN_ABI='x86' NDK_CROSS_PREFIX="i686-linux-android" CFLAGS="$CFLAGS -march=i686" - CFLAGS_LIBS="$CFLAGS_LIBS -march=i686" ;; esac diff --git a/ffmpeg_build.sh b/ffmpeg_build.sh index 07fd796..5ef3a90 100755 --- a/ffmpeg_build.sh +++ b/ffmpeg_build.sh @@ -5,8 +5,8 @@ pushd ffmpeg case $1 in - armeabi-v7a | armeabi-v7a-neon ) - CPU='armv7-a' + armeabi-v7a | armeabi-v7a-neon) + CPU='cortex-a8' ;; x86) CPU='i686' diff --git a/libpng_build.sh b/libpng_build.sh index 63b414b..58840a5 100755 Binary files a/libpng_build.sh and b/libpng_build.sh differ diff --git a/settings.sh b/settings.sh index 5a1698e..bdf7b94 100755 --- a/settings.sh +++ b/settings.sh @@ -16,5 +16,4 @@ TARGET_OS=linux CFLAGS='-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow -fstack-protector-all' LDFLAGS='-Wl,-z,relro -Wl,-z,now -pie' -CFLAGS_LIBS="-std=gnu99" FFMPEG_PKG_CONFIG="$(pwd)/ffmpeg-pkg-config" diff --git a/x264_build.sh b/x264_build.sh index 59ccae1..5922bd7 100755 --- a/x264_build.sh +++ b/x264_build.sh @@ -22,6 +22,7 @@ echo $CFLAGS --sysroot="$NDK_SYSROOT" \ --host="$HOST" \ --enable-pic \ + --disable-asm \ --enable-static \ --disable-shared \ --prefix="${TOOLCHAIN_PREFIX}" \