File tree 4 files changed +37
-11
lines changed 4 files changed +37
-11
lines changed Original file line number Diff line number Diff line change @@ -33,10 +33,11 @@ dependencies {
33
33
androidTestImplementation ' com.android.support.test:runner:1.0.2'
34
34
androidTestImplementation ' com.android.support.test.espresso:espresso-core:3.0.2'
35
35
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" ]
40
41
}
41
42
42
43
apply from : ' bintray.gradle'
Original file line number Diff line number Diff line change 2
2
3
3
[ ![ Download] [ icon_download ]] [ download ]
4
4
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
+ ```
8
20
9
21
基于[AndroidExec][AndroidExec]项目,FFmpeg命令执行
10
22
@@ -239,6 +251,7 @@ FFmpeg.destroy()
239
251
240
252
| 版本 | 描述 |
241
253
| --- | ---- |
254
+ | [1.2.0][FFmpeg1.2.0] | 新增armeabi架构,分离ffmpeg可执行文件 **2019-5-21** |
242
255
| [1.1.1][FFmpeg1.1.1] | 更新ffmpeg可执行文件,修改低版本机型中任务销毁时导致的阻塞 **2019-4-29** |
243
256
| [1.1.0][FFmpeg1.1.0] | 使用Builder模式创建命令任务,修复崩溃异常 **2018-9-3** |
244
257
| [1.0.0][FFmpeg1.0.0] | 集成FFmpeg命令行执行 **2018-8-17** |
@@ -268,6 +281,7 @@ FFmpeg.destroy()
268
281
269
282
<!-- 版本 -->
270
283
284
+ [FFmpeg1.2.0]:https://bintray.com/veizhang/maven/ffmpeg/1.2.0
271
285
[FFmpeg1.1.1]:https://bintray.com/veizhang/maven/ffmpeg/1.1.1
272
286
[FFmpeg1.1.0]:https://bintray.com/veizhang/maven/ffmpeg/1.1.0
273
287
[FFmpeg1.0.0]:https://bintray.com/veizhang/maven/ffmpeg/1.0.0
Original file line number Diff line number Diff line change 7
7
bintray = [
8
8
groupId : " com.excellence" ,
9
9
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' ]
12
12
]
13
13
14
14
// 插件
@@ -117,7 +117,11 @@ ext {
117
117
// https://github.com/VeiZhang/AndroidExec
118
118
" exec" : " com.excellence:exec:1.1.1" ,
119
119
// 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" ,
121
125
// https://github.com/VeiZhang/ImageLoader
122
126
" imageloader" : " com.excellence:imageloader:1.0.0" ,
123
127
" imageloader-fresco" : " com.excellence:imageloader-fresco:1.0.0" ,
Original file line number Diff line number Diff line change @@ -33,5 +33,12 @@ dependencies {
33
33
androidTestImplementation ' com.android.support.test.espresso:espresso-core:3.0.2'
34
34
implementation libs[" appcompat-v7" ]
35
35
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"]
37
44
}
You can’t perform that action at this time.
0 commit comments