Skip to content

Commit 1180b0c

Browse files
committed
Small fixes
1 parent 7e51e51 commit 1180b0c

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

FFmpegAndroid/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ android {
2828
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2929
}
3030
}
31+
buildToolsVersion '25.0.2'
3132
}
3233

3334
dependencies {

FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import android.content.Context;
44
import android.text.TextUtils;
55

6-
import java.lang.reflect.Array;
7-
import java.util.Map;
8-
96
import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException;
107
import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegNotSupportedException;
118

9+
import java.lang.reflect.Array;
10+
import java.util.Map;
11+
1212
@SuppressWarnings("unused")
1313
public class FFmpeg implements FFmpegInterface {
1414

@@ -116,7 +116,7 @@ public String getLibraryFFmpegVersion() {
116116

117117
@Override
118118
public boolean isFFmpegCommandRunning() {
119-
return ffmpegExecuteAsyncTask != null || !ffmpegExecuteAsyncTask.isProcessCompleted();
119+
return ffmpegExecuteAsyncTask != null && !ffmpegExecuteAsyncTask.isProcessCompleted();
120120
}
121121

122122
@Override
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="shipped_ffmpeg_version">n2.4.2</string>
3+
<string name="shipped_ffmpeg_version">n3.3.2</string>
44
</resources>

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ For examples and usage instructions head over to:
6262
## Supported Architecture
6363
* armv7
6464
* armv7-neon
65-
* x86
6665

6766
## Sample
6867
![http://i.imgur.com/cP4WhLn.gif](http://i.imgur.com/cP4WhLn.gif)

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ android {
2828
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2929
}
3030
}
31+
buildToolsVersion '25.0.0'
3132
}
3233

3334
dependencies {

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0-beta3'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
1010
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
@@ -26,5 +26,5 @@ ext {
2626
targetSdkVersion = 22
2727
minSdkVersion = 16
2828
versionCode = 28
29-
versionName = "0.3.4"
29+
versionName = "0.3.5"
3030
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 20 11:52:28 GMT+05:30 2016
1+
#Mon Aug 21 10:35:53 CEST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)