Merge branch 'master' into develop

hiteshsondhi88 · hiteshsondhi88 · commit 7b5474c5953c · 2014-09-12T11:26:43.000+05:30
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[FFmpeg-Android-Java](http://hiteshsondhi88.github.io/ffmpeg-android-java/)
+[FFmpeg-Android-Java](http://hiteshsondhi88.github.io/ffmpeg-android-java/) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FFmpeg--Android--Java-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/931)
 ==============
 
 * FFmpeg for Android compiled with x264, libass, fontconfig, freetype and fribidi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[FFmpeg-Android-Java](http://hiteshsondhi88.github.io/ffmpeg-android-java/)`
	`1`	`+[FFmpeg-Android-Java](http://hiteshsondhi88.github.io/ffmpeg-android-java/) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FFmpeg--Android--Java-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/931)`
`2`	`2`	`==============`
`3`	`3`
`4`	`4`	`* FFmpeg for Android compiled with x264, libass, fontconfig, freetype and fribidi`