diff options
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/libnaunet.wrap | 2 | ||||
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/meson.build | 32 | ||||
| -rw-r--r-- | subprojects/stela.wrap | 2 |
3 files changed, 19 insertions, 17 deletions
diff --git a/subprojects/libnaunet.wrap b/subprojects/libnaunet.wrap index 4700180..c6bd17a 100644 --- a/subprojects/libnaunet.wrap +++ b/subprojects/libnaunet.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://git.akon.city/libnaunet -revision = 23ec05f871f53b724dc6eb5e1c62d0245109c69d +revision = ef86574ec5d859727695da65f683f0774a3b4460 depth = 1 diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index 71b539b..0ecae9e 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -74,27 +74,29 @@ parsers += ',png' bsfs = 'extract_extradata,mp3_header_decompress' hwaccels = '' -if get_option('sink-use-vulkan') - extra_options += ['--enable-vulkan'] - hwaccels += 'h264_vulkan,hevc_vulkan,av1_vulkan' -elif is_windows - extra_options += ['--enable-d3d11va'] - hwaccels += 'h264_d3d11va,hevc_d3d11va,av1_d3d11va,vp9_d3d11va' - hwaccels += ',h264_d3d11va2,hevc_d3d11va2,av1_d3d11va2,vp9_d3d11va2' - #extra_options += ['--enable-dxva2'] - #hwaccels += ',h264_dxva2,hevc_dxva2,av1_dxva2,vp9_dxva2' -elif is_android - extra_options += ['--enable-jni', '--enable-mediacodec'] - decoders += ',h264_mediacodec,hevc_mediacodec,av1_mediacodec,vp9_mediacodec' -elif is_linux - extra_options += ['--enable-vaapi'] +if get_option('codec-hwaccel').enabled() + if get_option('renderer-api') == 'vulkan' + extra_options += ['--enable-vulkan'] + hwaccels += 'h264_vulkan,hevc_vulkan,av1_vulkan' + elif is_windows + extra_options += ['--enable-d3d11va'] + hwaccels += 'h264_d3d11va,hevc_d3d11va,av1_d3d11va,vp9_d3d11va' + hwaccels += ',h264_d3d11va2,hevc_d3d11va2,av1_d3d11va2,vp9_d3d11va2' + #extra_options += ['--enable-dxva2'] + #hwaccels += ',h264_dxva2,hevc_dxva2,av1_dxva2,vp9_dxva2' + elif is_android + extra_options += ['--enable-jni', '--enable-mediacodec'] + decoders += ',h264_mediacodec,hevc_mediacodec,av1_mediacodec,vp9_mediacodec' + elif is_linux + extra_options += ['--enable-vaapi'] + endif endif if hwaccels != '' extra_options += ['--enable-hwaccel=' + hwaccels] endif -protocols = 'file,cache' +protocols = 'cache' if is_linux or is_mingw extra_options += ['--enable-libsoxr'] diff --git a/subprojects/stela.wrap b/subprojects/stela.wrap index 62748d5..c8a8139 100644 --- a/subprojects/stela.wrap +++ b/subprojects/stela.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://git.akon.city/stela -revision = e2304d573cbfa5fe3076b0f702e384bcf7229695 +revision = 7d4434ea4ceb1fa5c75f372a73ac6dfe5cb05b1d depth = 1 |