Skip to content

Commit

Permalink
v1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
wseemann committed Dec 14, 2016
1 parent 1f3ec50 commit a9e461a
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 15 deletions.
24 changes: 16 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,31 @@ FFmpegMediaPlayer

View the project page <a href=http://wseemann.github.io/FFmpegMediaPlayer/>here</a>.

Donate
Donations
------------

Donations can be made via PayPal:

<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4KK2RERB2VKL8" alt="PayPal - The safer, easier way to pay online!">
<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif">
</a>
**This project needs you!** If you would like to support this project's further development, the creator of this project or the continuous maintenance of this project, **feel free to donate**. Your donation is highly appreciated (and I love food and coffee). Thank you!

<a href="https://flattr.com/submit/auto?user_id=wseemann&url=https%3A%2F%2Fgithub.com%2Fwseemann%2FFFmpegMediaPlayer" target="_blank"><img src="//api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0"></a>
**PayPal**

- [**Donate 5 $**] (https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2BDTFVEW9LFZY): Thank's for creating this project, here's a coffee for you!
- [**Donate 10 $**] (https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2BDTFVEW9LFZY): Wow, I am stunned. Let me take you to the movies!
- [**Donate 15 $**] (https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2BDTFVEW9LFZY): I really appreciate your work, let's grab some lunch!
- [**Donate 25 $**] (https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2BDTFVEW9LFZY): That's some awesome stuff you did right there, dinner is on me!
- [**Donate 50 $**] (https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2BDTFVEW9LFZY): I really really want to support this project, great job!
- [**Donate 100 $**] (https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2BDTFVEW9LFZY): You are the man! This project saved me hours (if not days) of struggle and hard work, simply awesome!
- Of course, you can also [**choose what you want to donate**](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2BDTFVEW9LFZY), all donations are awesome!

Overview
--------

FFmpegMediaPlayer is a reimplementation of Android's MediaPlayer class. The FFmpegMediaPlayer class provides a unified interface for playing audio files and streams.

Key Features:
* ARM, ARMv7, x86, x86_64, MIPS and ARM_64 support

* Support for additional formats and protocols not provided by Android's MediaPlayer class

Supported protocols:
Expand All @@ -37,12 +45,12 @@ Using FMP in your application (Android Studio)
Add the following maven dependency to your project's `build.gradle` file:

dependencies {
compile 'com.github.wseemann:FFmpegMediaPlayer:1.0.3'
compile 'com.github.wseemann:FFmpegMediaPlayer:1.0.4'
}

or, if your application supports individual architectures extract the appropriate AAR file into you projects "libs" folder:

[Prebuilt AARs] (https://github.com/wseemann/FFmpegMediaPlayer/releases/download/v1.0.3/prebuilt-aars.zip)
[Prebuilt AARs] (https://github.com/wseemann/FFmpegMediaPlayer/releases/download/v1.0.4/prebuilt-aars.zip)

(with HTTPS support)

Expand Down Expand Up @@ -171,7 +179,7 @@ License
```
FFmpegMediaPlayer: A unified interface for playing audio files and streams.
Copyright 2016s William Seemann
Copyright 2016 William Seemann
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions gradle/fmp-library/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
POM_NAME=FFmpegMediaPlayer
POM_ARTIFACT_ID=FFmpegMediaPlayer
POM_PACKAGING=aar
VERSION_NAME=1.0.3
VERSION_CODE=4
VERSION_NAME=1.0.4
VERSION_CODE=5
GROUP=com.github.wseemann

POM_DESCRIPTION=Foo library
Expand Down
4 changes: 2 additions & 2 deletions gradle/fmp-library/library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ android {
defaultConfig {
minSdkVersion 12
targetSdkVersion 25
versionCode 4
versionName "1.0.3"
versionCode 5
versionName "1.0.4"
}
buildTypes {
release {
Expand Down
3 changes: 1 addition & 2 deletions gradle/fmp-library/library/src/main/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# build with android-ndk-r10e

APP_ABI := armeabi armeabi-v7a x86 mips x86_64
# arm64-v8a
APP_ABI := armeabi armeabi-v7a x86 mips x86_64 arm64-v8a
2 changes: 1 addition & 1 deletion gradle/fmp-library/local.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
#Sun Oct 18 19:45:39 CDT 2015
libs.dir=/Users/seemann/Desktop
sdk.dir=/Users/wseemann/Library/Android/sdk
ndk.dir=/Users/wseemann/Android/android-ndk-r10d
ndk.dir=/Users/wseemann/Android/android-ndk-r11c

0 comments on commit a9e461a

Please sign in to comment.