File tree Expand file tree Collapse file tree 7 files changed +12
-11
lines changed
java/com/github/hiteshsondhi88/libffmpeg Expand file tree Collapse file tree 7 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ android {
28
28
proguardFiles getDefaultProguardFile(' proguard-android.txt' ), ' proguard-rules.pro'
29
29
}
30
30
}
31
+ buildToolsVersion ' 25.0.2'
31
32
}
32
33
33
34
dependencies {
Original file line number Diff line number Diff line change 3
3
import android .content .Context ;
4
4
import android .text .TextUtils ;
5
5
6
- import java .lang .reflect .Array ;
7
- import java .util .Map ;
8
-
9
6
import com .github .hiteshsondhi88 .libffmpeg .exceptions .FFmpegCommandAlreadyRunningException ;
10
7
import com .github .hiteshsondhi88 .libffmpeg .exceptions .FFmpegNotSupportedException ;
11
8
9
+ import java .lang .reflect .Array ;
10
+ import java .util .Map ;
11
+
12
12
@ SuppressWarnings ("unused" )
13
13
public class FFmpeg implements FFmpegInterface {
14
14
@@ -116,7 +116,7 @@ public String getLibraryFFmpegVersion() {
116
116
117
117
@ Override
118
118
public boolean isFFmpegCommandRunning () {
119
- return ffmpegExecuteAsyncTask != null || !ffmpegExecuteAsyncTask .isProcessCompleted ();
119
+ return ffmpegExecuteAsyncTask != null && !ffmpegExecuteAsyncTask .isProcessCompleted ();
120
120
}
121
121
122
122
@ Override
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
2
<resources >
3
- <string name =" shipped_ffmpeg_version" >n2.4 .2</string >
3
+ <string name =" shipped_ffmpeg_version" >n3.3 .2</string >
4
4
</resources >
Original file line number Diff line number Diff line change @@ -62,7 +62,6 @@ For examples and usage instructions head over to:
62
62
## Supported Architecture
63
63
* armv7
64
64
* armv7-neon
65
- * x86
66
65
67
66
## Sample
68
67
![ http://i.imgur.com/cP4WhLn.gif ] ( http://i.imgur.com/cP4WhLn.gif )
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ android {
28
28
proguardFiles getDefaultProguardFile(' proguard-android.txt' ), ' proguard-rules.pro'
29
29
}
30
30
}
31
+ buildToolsVersion ' 25.0.0'
31
32
}
32
33
33
34
dependencies {
Original file line number Diff line number Diff line change @@ -5,8 +5,8 @@ buildscript {
5
5
jcenter()
6
6
}
7
7
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 '
10
10
classpath " com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1"
11
11
12
12
// NOTE: Do not place your application dependencies here; they belong
26
26
targetSdkVersion = 22
27
27
minSdkVersion = 16
28
28
versionCode = 28
29
- versionName = " 0.3.4 "
29
+ versionName = " 0.3.5 "
30
30
}
Original file line number Diff line number Diff line change 1
- # Wed Apr 20 11:52:28 GMT+05:30 2016
1
+ # Mon Aug 21 10:35:53 CEST 2017
2
2
distributionBase =GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
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
You can’t perform that action at this time.
0 commit comments