Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified FFmpegAndroid/assets/armeabi-v7a/ffmpeg
100644 → 100755
Binary file not shown.
Binary file added FFmpegAndroid/assets/armeabi-v7a/libopenh264.so
Binary file not shown.
Binary file modified FFmpegAndroid/assets/x86/ffmpeg
100644 → 100755
Binary file not shown.
Binary file added FFmpegAndroid/assets/x86/libopenh264.so
Binary file not shown.
Binary file added FFmpegAndroid/libs/armeabi-v7a/libopenh264.so
Binary file not shown.
Binary file added FFmpegAndroid/libs/armeabi/libopenh264.so
Binary file not shown.
Binary file added FFmpegAndroid/libs/x86/libopenh264.so
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
import android.text.TextUtils;

enum CpuArch {
x86("0dd4dbad305ff197a1ea9e6158bd2081d229e70e"),
ARMv7("871888959ba2f063e18f56272d0d98ae01938ceb"),
x86("a92863e1fba435ba46e5321286bfa8542a7fdd74"),
ARMv7("f51256ddb13c2a4d2bb9e22812775751c32cfdf4"),
NONE(null);


private String sha1;

CpuArch(String sha1) {
Expand Down
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0-beta3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -21,10 +21,10 @@ allprojects {
}

ext {
compileSdkVersion = 22
buildToolsVersion = '22.0.1'
compileSdkVersion = 23
buildToolsVersion = '23.0.1'
targetSdkVersion = 22
minSdkVersion = 16
versionCode = 28
versionName = "0.3.2"
minSdkVersion = 17
versionCode = 29
versionName = "0.3.3"
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_NAME=0.3.2
VERSION_NAME=0.3.3
VERSION_CODE=28
GROUP=com.writingminds

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 20 11:52:28 GMT+05:30 2016
#2017-05-02T05:58:03+00:00
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip