Merge branch 'release/v0.2.0'

.gitignore

@@ -1,3 +1,38 @@
 *.o
 build
 toolchain-*
+libpng-*
+expat-*
+fribidi-*
+
+# Created by http://www.gitignore.io
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Linux ###
+*~
+
+# KDE directory preferences
+.directory

.gitmodules

@@ -13,12 +13,6 @@
 [submodule "fontconfig"]
 	path = fontconfig
 	url = git://anongit.freedesktop.org/fontconfig
-[submodule "expat"]
-	path = expat
-	url = https://github.com/hiteshsondhi88/expat.git
-[submodule "libpng"]
-	path = libpng
-	url = https://github.com/hiteshsondhi88/libpng.git
-[submodule "fribidi"]
-	path = fribidi
-	url = https://github.com/hiteshsondhi88/fribidi.git
+[submodule "SampleFFmpegApp"]
+	path = SampleFFmpegApp
+	url = https://github.com/hiteshsondhi88/SampleFFmpegApp.git

README.md

@@ -10,16 +10,17 @@ Supported Architecture
 
 Instructions
 ----
-* Edit settings.sh and set ANDROID_NDK_ROOT_PATH according to your NDK root path
+* Set environment variable
+  1. export ANDROID_NDK={Android NDK Base Path}
 * Run following commands to compile ffmpeg
   1. sudo apt-get --quiet --yes install build-essential git autoconf libtool pkg-config gperf gettext
-  2. git submodule update --init
+  2. ./init_update_libs.sh
   3. ./android_build.sh
+* 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](prebuilt-binaries.tar.gz?raw=true) here.
+* You can also download [prebuilt-binaries](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.1.0/prebuilt-binaries.tar.gz) here.
 
 License
 ----
   check files LICENSE.GPLv3 and LICENSE
-