Skip to content

Commit 82aa6b3

Browse files
committed
发布版本1.2.0
1 parent f7fdbf0 commit 82aa6b3

File tree

4 files changed

+37
-11
lines changed

4 files changed

+37
-11
lines changed

AndroidFFmpegLibrary/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ dependencies {
3333
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3434
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3535
implementation libs["appcompat-v7"]
36-
api project(':FFmpeg-java')
37-
api project(':FFmpeg-armeabi')
38-
api project(':FFmpeg-armv7a')
39-
api project(':FFmpeg-x86')
36+
37+
api libs["ffmpeg-java"]
38+
api libs["ffmpeg-armeabi"]
39+
api libs["ffmpeg-armv7a"]
40+
api libs["ffmpeg-x86"]
4041
}
4142

4243
apply from: 'bintray.gradle'

README.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,21 @@
22

33
[![Download][icon_download]][download]
44

5-
```
6-
implementation 'com.excellence:ffmpeg:_latestVersion'
7-
```
5+
* 完整引用
6+
```
7+
// 完整引用,集成所有CPU架构的可执行文件
8+
implementation 'com.excellence:ffmpeg:_latestVersion'
9+
```
10+
11+
* 部分引用
12+
```
13+
implementation 'com.excellence:ffmpeg-java:_latestVersion'
14+
15+
// 部分引用,使用想要的CPU架构的可执行文件
16+
implementation 'com.excellence:ffmpeg-armeabi:_latestVersion'
17+
implementation 'com.excellence:ffmpeg-armv7a:_latestVersion'
18+
implementation 'com.excellence:ffmpeg-x86:_latestVersion'
19+
```
820
921
基于[AndroidExec][AndroidExec]项目,FFmpeg命令执行
1022
@@ -239,6 +251,7 @@ FFmpeg.destroy()
239251
240252
| 版本 | 描述 |
241253
| --- | ---- |
254+
| [1.2.0][FFmpeg1.2.0] | 新增armeabi架构,分离ffmpeg可执行文件 **2019-5-21** |
242255
| [1.1.1][FFmpeg1.1.1] | 更新ffmpeg可执行文件,修改低版本机型中任务销毁时导致的阻塞 **2019-4-29** |
243256
| [1.1.0][FFmpeg1.1.0] | 使用Builder模式创建命令任务,修复崩溃异常 **2018-9-3** |
244257
| [1.0.0][FFmpeg1.0.0] | 集成FFmpeg命令行执行 **2018-8-17** |
@@ -268,6 +281,7 @@ FFmpeg.destroy()
268281
269282
<!-- 版本 -->
270283
284+
[FFmpeg1.2.0]:https://bintray.com/veizhang/maven/ffmpeg/1.2.0
271285
[FFmpeg1.1.1]:https://bintray.com/veizhang/maven/ffmpeg/1.1.1
272286
[FFmpeg1.1.0]:https://bintray.com/veizhang/maven/ffmpeg/1.1.0
273287
[FFmpeg1.0.0]:https://bintray.com/veizhang/maven/ffmpeg/1.0.0

config.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ext {
77
bintray = [
88
groupId : "com.excellence",
99
publishVersion : "1.2.0",
10-
website : 'https://github.com/VeiZhang/FFmpegAndroid',
11-
licences : "['Apache-2.0']"
10+
website : "https://github.com/VeiZhang/FFmpegAndroid",
11+
licences : ['Apache-2.0']
1212
]
1313

1414
// 插件
@@ -117,7 +117,11 @@ ext {
117117
// https://github.com/VeiZhang/AndroidExec
118118
"exec" : "com.excellence:exec:1.1.1",
119119
// https://github.com/VeiZhang/AndroidFFmpeg
120-
"ffmpeg" : "com.excellence:ffmpeg:1.1.0",
120+
"ffmpeg" : "com.excellence:ffmpeg:1.2.0",
121+
"ffmpeg-java" : "com.excellence:ffmpeg-java:1.2.0",
122+
"ffmpeg-armeabi" : "com.excellence:ffmpeg-armeabi:1.2.0",
123+
"ffmpeg-armv7a" : "com.excellence:ffmpeg-armv7a:1.2.0",
124+
"ffmpeg-x86" : "com.excellence:ffmpeg-x86:1.2.0",
121125
// https://github.com/VeiZhang/ImageLoader
122126
"imageloader" : "com.excellence:imageloader:1.0.0",
123127
"imageloader-fresco" : "com.excellence:imageloader-fresco:1.0.0",

sample/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,12 @@ dependencies {
3333
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3434
implementation libs["appcompat-v7"]
3535
implementation libs["constraint-layout"]
36-
implementation project(':AndroidFFmpegLibrary')
36+
37+
// 完整引用
38+
// implementation project(':AndroidFFmpegLibrary')
39+
implementation libs["ffmpeg"]
40+
41+
// implementation libs["ffmpeg-java"]
42+
// 部分引用,使用想要的CPU架构的可执行文件
43+
// implementation libs["ffmpeg-armeabi"]
3744
}

0 commit comments

Comments
 (0)