Skip to content

Commit bcac007

Browse files
Merge branch 'release/v0.2.2'
2 parents 6e2849c + d7fee70 commit bcac007

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg

100644100755
93.1 KB
Binary file not shown.

FFmpegAndroid/assets/armeabi-v7a/ffmpeg

100644100755
93.1 KB
Binary file not shown.

FFmpegAndroid/assets/x86/ffmpeg

100644100755
100 KB
Binary file not shown.

FFmpegAndroid/build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.github.hiteshsondhi88.libffmpeg"
99
minSdkVersion 16
1010
targetSdkVersion 16
11-
versionCode 21
12-
versionName "0.2.1"
11+
versionCode 22
12+
versionName "0.2.2"
1313
}
1414

1515
sourceSets.main {
@@ -29,3 +29,5 @@ android {
2929
dependencies {
3030
compile fileTree(dir: 'libs', include: ['*.jar'])
3131
}
32+
33+
apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<resources>
22
<string name="app_name">FFmpegAndroid</string>
3-
<string name="shipped_ffmpeg_version">n2.3.3</string>
3+
<string name="shipped_ffmpeg_version">n2.4</string>
44
</resources>

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.github.hiteshsondhi88.sampleffmpeg"
99
minSdkVersion 16
1010
targetSdkVersion 20
11-
versionCode 21
12-
versionName "0.2.1"
11+
versionCode 22
12+
versionName "0.2.2"
1313
}
1414

1515
sourceSets.main {

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=0.2.1
2-
VERSION_CODE=21
1+
VERSION_NAME=0.2.2
2+
VERSION_CODE=22
33
GROUP=com.github.hiteshsondhi88.libffmpeg
44

55
POM_DESCRIPTION=Java implementation of ffmpeg for Android

0 commit comments

Comments
 (0)