From 1cd145b8a95ffa3caff8e085ed9d4d22b64df3c9 Mon Sep 17 00:00:00 2001
From: Hitesh Sondhi <hiteshsondhi88@gmail.com>
Date: Thu, 18 Sep 2014 01:05:44 +0530
Subject: [PATCH 1/3] Removed CFLAG_LIBS

---
 abi_settings.sh | 3 ---
 settings.sh     | 1 -
 2 files changed, 4 deletions(-)

diff --git a/abi_settings.sh b/abi_settings.sh
index 590aa8e..8900011 100755
--- a/abi_settings.sh
+++ b/abi_settings.sh
@@ -10,21 +10,18 @@ case $1 in
     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"
   ;;
   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/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"

From 1b2069e6b72f475bd6c3609667732ea8efdfdf84 Mon Sep 17 00:00:00 2001
From: Hitesh Sondhi <hiteshsondhi88@gmail.com>
Date: Fri, 19 Sep 2014 16:03:21 +0530
Subject: [PATCH 2/3] Updated scripts, fixed a bug which was causing Illegal
 Instruction error in some arm devices

---
 abi_settings.sh |   3 +--
 ffmpeg_build.sh |   4 ++--
 libpng_build.sh | Bin 439 -> 436 bytes
 x264_build.sh   |   1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/abi_settings.sh b/abi_settings.sh
index 8900011..766634a 100755
--- a/abi_settings.sh
+++ b/abi_settings.sh
@@ -9,13 +9,12 @@ case $1 in
     NDK_ABI='arm'
     NDK_TOOLCHAIN_ABI='arm-linux-androideabi'
     NDK_CROSS_PREFIX="${NDK_TOOLCHAIN_ABI}"
-    CFLAGS="$CFLAGS -march=armv7-a"
   ;;
   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="${CFLAGS} -mfpu=neon"
   ;;
   x86)
     NDK_ABI='x86'
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 63b414b0d58f10b2bf7d26260ea06f0f35e56c25..58840a590da4ec5afcccf13047cc91f1f514c81b 100755
GIT binary patch
delta 7
OcmdnayoGtg7DfOJBLdd|

delta 11
ScmdnOyq$T&7Di?U1}*>>j{@WX

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}" \

From 35ac198b1a0e6781e81269fdd3da9d269a9217f9 Mon Sep 17 00:00:00 2001
From: Hitesh Sondhi <hiteshsondhi88@gmail.com>
Date: Fri, 19 Sep 2014 16:05:26 +0530
Subject: [PATCH 3/3] Updated Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ----