@@ -2942,6 +2942,7 @@ project(":media") {
2942
2942
media name : " ffmpeg-3.3.3" , ext : " tar.gz"
2943
2943
media name : " ffmpeg-4.0.2" , ext : " tar.gz"
2944
2944
media name : " ffmpeg-5.1.2" , ext : " tar.gz"
2945
+ media name : " ffmpeg-6.0" , ext : " tar.gz"
2945
2946
}
2946
2947
implementation project(" :base" )
2947
2948
implementation project(" :graphics" )
@@ -3084,7 +3085,7 @@ project(":media") {
3084
3085
if (t. name == " linux" ) {
3085
3086
// Pre-defined command line arguments
3086
3087
def cfgCMDArgs = [" sh" , " configure" ]
3087
- def commonCfgArgs = [" --enable-shared" , " --disable-debug" , " --disable-static" , " --disable-yasm " , " --disable-doc" , " --disable-programs" , " --disable-everything" ]
3088
+ def commonCfgArgs = [" --enable-shared" , " --disable-debug" , " --disable-static" , " --disable-asm " , " --disable-doc" , " --disable-programs" , " --disable-everything" ]
3088
3089
def codecsCfgArgs = [" --enable-decoder=aac,mp3,mp3float,h264,hevc" , " --enable-parser=aac,h264,hevc" , " --enable-demuxer=aac,h264,hevc,mpegts,mpegtsraw" ]
3089
3090
3090
3091
def copyLibAVStubs = {String fromDir , String toDir ->
@@ -3288,8 +3289,8 @@ project(":media") {
3288
3289
doLast {
3289
3290
project. ext. libav = [:]
3290
3291
project. ext. libav. basedir = " ${ buildDir} /native/linux/ffmpeg"
3291
- project. ext. libav. versions = [ " 3.3.3" , " 4.0.2" , " 5.1.2" ]
3292
- project. ext. libav. versionmap = [ " 3.3.3" : " 57" , " 4.0.2" : " 58" , " 5.1.2" : " 59" ]
3292
+ project. ext. libav. versions = [ " 3.3.3" , " 4.0.2" , " 5.1.2" , " 6.0 " ]
3293
+ project. ext. libav. versionmap = [ " 3.3.3" : " 57" , " 4.0.2" : " 58" , " 5.1.2" : " 59" , " 6.0 " : " 60 " ]
3293
3294
3294
3295
libav. versions. each { version ->
3295
3296
def libavDir = " ${ libav.basedir} /ffmpeg-${ version} "
@@ -3369,7 +3370,7 @@ project(":media") {
3369
3370
project. ext. libav. libavffmpeg. versions = [ " 56" ]
3370
3371
project. ext. libav. ffmpeg = [:]
3371
3372
project. ext. libav. ffmpeg. basedir = " ${ buildDir} /native/linux/ffmpeg/ffmpeg"
3372
- project. ext. libav. ffmpeg. versions = [ " 57" , " 58" , " 59" ]
3373
+ project. ext. libav. ffmpeg. versions = [ " 57" , " 58" , " 59" , " 60 " ]
3373
3374
3374
3375
project. ext. libav. versions. each { version ->
3375
3376
def libavDir = " ${ project.ext.libav.basedir} -${ version} "
0 commit comments