Skip to content

Commit

Permalink
Merge pull request #3 from brarcher/readme
Browse files Browse the repository at this point in the history
Update README
  • Loading branch information
brarcher authored Apr 1, 2018
2 parents e4db154 + 12cff4f commit 3afcabf
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[FFmpeg-Android](http://hiteshsondhi88.github.io/ffmpeg-android/) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FFmpeg--Android-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/925) [![Build Status](https://travis-ci.org/trongvu/ffmpeg-android.svg?branch=master)](https://travis-ci.org/trongvu/ffmpeg-android)
[FFmpeg-Android](http://hiteshsondhi88.github.io/ffmpeg-android/) [![Build Status](https://travis-ci.org/brarcher/ffmpeg-android.svg?branch=master)](https://travis-ci.org/brarcher/ffmpeg-android)
==============

* FFmpeg for Android compiled with x264, libass, fontconfig, freetype and fribidi
* Supports Android L
* [FFmpeg Android Library](https://github.com/hiteshsondhi88/ffmpeg-android-java)
* [FFmpeg Android Library](https://github.com/brarcher/ffmpeg-android-java)

Supported Architecture
----
* armv7
* armv7-neon
* x86

Instructions
Expand All @@ -22,16 +21,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](https://github.com/hiteshsondhi88/ffmpeg-android/releases/latest) (Releases > Downloads > prebuilt-binaries[zip|tar.gz]).

License
----
check files LICENSE.GPLv3 and 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")

0 comments on commit 3afcabf

Please sign in to comment.