Skip to content

Commit

Permalink
v1.0.13
Browse files Browse the repository at this point in the history
  • Loading branch information
wseemann committed Nov 17, 2016
1 parent 6c3be9d commit f2060c6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Overview
FFmpegMediaMetadataRetriever is a reimplementation of Android's MediaMetadataRetriever class. The FFmpegMediaMetadataRetriever class provides a unified interface for retrieving frame and meta data from an input media file and uses FFmpeg as its backend.

Key Features:
* ARM, ARMv7, x86, x86_64 and MIPS support
* ARM, ARMv7, x86, x86_64, MIPS and ARM_64 support
* Support for API 12+
* URL support (Unlike MediaMetadataRetriever, see: http://code.google.com/p/android/issues/detail?id=35794)

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

dependencies {
compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.12'
compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.13'
}

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

[Prebuilt AARs] (https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.12/prebuilt-aars.zip)
[Prebuilt AARs] (https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.13/prebuilt-aars.zip)

(with HTTPS support)

Expand All @@ -61,7 +61,7 @@ Installation
FFmpegMediaMetadataRetriever relies on FFmpeg and native code. The build process
is complex and may be confusing for those unfamiliar the Android NDK. For this
reason I've precompiled AARs created by the build process and checked them
in [here] (https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.11/prebuilt-aars.zip).
in [here] (https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.13/prebuilt-aars.zip).
The modules are also included with the library. If you don't want to build the modules
you can simple unzip the prebuilt ones and copy them to your projects "libs" folder. (Note:
copy them to YOUR projects "libs" folder, NOT the "libs" folder located in
Expand Down
6 changes: 3 additions & 3 deletions gradle/fmmr-library/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
POM_NAME=FFmpegMediaMetadataRetriever
POM_ARTIFACT_ID=FFmpegMediaMetadataRetriever
POM_PACKAGING=aar
VERSION_NAME=1.0.12
VERSION_CODE=13
VERSION_NAME=1.0.13
VERSION_CODE=14
GROUP=com.github.wseemann

POM_DESCRIPTION=FFmpegMediaMetadataRetriever library
Expand All @@ -42,5 +42,5 @@ SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots
RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2

signing.keyId=94F92DAB
signing.password=Xxxxxxx55
signing.password=Xxxxxxxx55
signing.secretKeyRingFile=/Users/wseemann/.gnupg/secring.gpg
9 changes: 5 additions & 4 deletions gradle/fmmr-library/library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
android {
android.packageBuildConfig = false

compileSdkVersion 23
compileSdkVersion 25
buildToolsVersion "21.1.2"

def mkfile = "NDK_APPLICATION_MK=Application.mk"
Expand All @@ -29,10 +29,11 @@ android {

defaultConfig {
minSdkVersion 12
targetSdkVersion 23
versionCode 13
versionName "1.0.12"
targetSdkVersion 25
versionCode 14
versionName "1.0.13"
}

buildTypes {
release {
//minifyEnabled false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# build with android-ndk-r9

APP_ABI := arm64
APP_ABI := arm64-v8a

0 comments on commit f2060c6

Please sign in to comment.