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