@@ -269,6 +269,8 @@ def config_options(self):
269
269
del self .options .with_mediacodec
270
270
if not self ._version_supports_libsvtav1 :
271
271
self .options .rm_safe ("with_libsvtav1" )
272
+ if self .settings .os == "Android" :
273
+ del self .options .with_libfdk_aac
272
274
273
275
def configure (self ):
274
276
if self .options .shared :
@@ -293,7 +295,7 @@ def requirements(self):
293
295
if self .options .with_openjpeg :
294
296
self .requires ("openjpeg/2.5.2" )
295
297
if self .options .with_openh264 :
296
- self .requires ("openh264/2.3 .1" )
298
+ self .requires ("openh264/2.4 .1" )
297
299
if self .options .with_vorbis :
298
300
self .requires ("vorbis/1.3.7" )
299
301
if self .options .with_opus :
@@ -303,14 +305,14 @@ def requirements(self):
303
305
if self .options .with_sdl :
304
306
self .requires ("sdl/2.28.5" )
305
307
if self .options .with_libx264 :
306
- self .requires ("libx264/cci.20220602 " )
308
+ self .requires ("libx264/cci.20240224 " )
307
309
if self .options .with_libx265 :
308
310
self .requires ("libx265/3.4" )
309
311
if self .options .with_libvpx :
310
- self .requires ("libvpx/1.13 .1" )
312
+ self .requires ("libvpx/1.14 .1" )
311
313
if self .options .with_libmp3lame :
312
314
self .requires ("libmp3lame/3.100" )
313
- if self .options .with_libfdk_aac :
315
+ if self .options .get_safe ( " with_libfdk_aac" ) :
314
316
self .requires ("libfdk_aac/2.0.3" )
315
317
if self .options .with_libwebp :
316
318
self .requires ("libwebp/1.3.2" )
@@ -329,11 +331,11 @@ def requirements(self):
329
331
if self .options .get_safe ("with_vulkan" ):
330
332
self .requires ("vulkan-loader/1.3.243.0" )
331
333
if self .options .get_safe ("with_libsvtav1" ):
332
- self .requires ("libsvtav1/1.6 .0" )
334
+ self .requires ("libsvtav1/2.1 .0" )
333
335
if self .options .with_libaom :
334
336
self .requires ("libaom-av1/3.6.1" )
335
337
if self .options .get_safe ("with_libdav1d" ):
336
- self .requires ("dav1d/1.2.1 " )
338
+ self .requires ("dav1d/1.4.3 " )
337
339
if self .options .get_safe ("with_libdrm" ):
338
340
self .requires ("libdrm/2.4.119" )
339
341
@@ -505,7 +507,7 @@ def opt_append_disable_if_set(args, what, v):
505
507
opt_enable_disable ("libx265" , self .options .with_libx265 ),
506
508
opt_enable_disable ("libvpx" , self .options .with_libvpx ),
507
509
opt_enable_disable ("libmp3lame" , self .options .with_libmp3lame ),
508
- opt_enable_disable ("libfdk-aac" , self .options .with_libfdk_aac ),
510
+ opt_enable_disable ("libfdk-aac" , self .options .get_safe ( " with_libfdk_aac" ) ),
509
511
opt_enable_disable ("libwebp" , self .options .with_libwebp ),
510
512
opt_enable_disable ("libaom" , self .options .with_libaom ),
511
513
opt_enable_disable ("openssl" , self .options .with_ssl == "openssl" ),
@@ -532,7 +534,7 @@ def opt_append_disable_if_set(args, what, v):
532
534
"--disable-cuda" , # FIXME: CUDA support
533
535
"--disable-cuvid" , # FIXME: CUVID support
534
536
# Licenses
535
- opt_enable_disable ("nonfree" , self .options .with_libfdk_aac or (self .options .with_ssl and (
537
+ opt_enable_disable ("nonfree" , self .options .get_safe ( " with_libfdk_aac" ) or (self .options .with_ssl and (
536
538
self .options .with_libx264 or self .options .with_libx265 or self .options .postproc ))),
537
539
opt_enable_disable ("gpl" , self .options .with_libx264 or self .options .with_libx265 or self .options .postproc )
538
540
]
@@ -854,6 +856,8 @@ def _add_component(name, dependencies):
854
856
avdevice .frameworks .append ("AVFoundation" )
855
857
if self .options .get_safe ("with_audiotoolbox" ):
856
858
avdevice .frameworks .append ("CoreAudio" )
859
+ if self .settings .os == "Android" and not self .options .shared :
860
+ avdevice .system_libs .extend (["android" , "camera2ndk" , "mediandk" ])
857
861
858
862
if self .options .avcodec :
859
863
if self .options .with_zlib :
@@ -878,7 +882,7 @@ def _add_component(name, dependencies):
878
882
avcodec .requires .append ("libvpx::libvpx" )
879
883
if self .options .with_libmp3lame :
880
884
avcodec .requires .append ("libmp3lame::libmp3lame" )
881
- if self .options .with_libfdk_aac :
885
+ if self .options .get_safe ( " with_libfdk_aac" ) :
882
886
avcodec .requires .append ("libfdk_aac::libfdk_aac" )
883
887
if self .options .with_libwebp :
884
888
avcodec .requires .append ("libwebp::libwebp" )
0 commit comments