Merge tag 'v0.3.4' into develop

v0.3.4

Author: Hitesh Sondhi

README.md

@@ -16,7 +16,7 @@ Instructions
 * 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 yasm
+  1. sudo apt-get --quiet --yes install build-essential git autoconf libtool pkg-config gperf gettext yasm python-lxml
   2. ./init_update_libs.sh
   3. ./android_build.sh
 * To update submodules and libraries you can use ./init_update_libs.sh command
@@ -31,3 +31,7 @@ License
 HIRE US
 --------
 Get in touch with us - http://www.writingminds.com
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/hiteshsondhi88/ffmpeg-android/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

ffmpeg

@@ -9,7 +9,7 @@ rm -rf libpng-*
 rm -rf expat-*
 rm -rf fribidi-*
 
-wget -O- ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.18.tar.xz | tar xJ
+wget -O- ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.21.tar.xz | tar xJ
 wget -O- http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz | tar xz
 wget -O- http://fribidi.org/download/fribidi-0.19.7.tar.bz2 | tar xj
 wget -O- http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz | tar xz

freetype2

@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd libpng-1.6.18
+pushd libpng-1.6.21
 
 make clean