From 566c022572bbff8bb7ff105b9adbe74500b2c716 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Fri, 10 Jul 2026 14:04:29 -0400 Subject: Build fixes, get LTO+Os working on Windows Signed-off-by: Andrew Opalach --- subprojects/packagefiles/ffmpeg/meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'subprojects/packagefiles/ffmpeg/meson.build') diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index 7481dea..ed3617c 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -73,7 +73,9 @@ decoders += ',pcm_s32be,pcm_s32le,pcm_s24be,pcm_s24le,pcm_s16be,pcm_s16le' decoders += ',dca,eac3' decoders += ',pcm_dvd,mpegvideo,mpeg2video' decoders += ',av1' -#decoders += ',ass,srt' +if get_option('subtitles').enabled() + decoders += ',ass,srt,webvtt' +endif #if get_option('codec-hwaccels').length() == 0 libdav1d = dependency('dav1d', required: false) if libdav1d.found() @@ -84,6 +86,7 @@ decoders += ',av1' #endif demuxers = '' +muxers = '' parsers = '' if not get_option('sink-only') demuxers += 'flac,mp3,aac,wav,matroska,mov,avi' @@ -91,7 +94,10 @@ if not get_option('sink-only') #demuxers += ',pcm_f32be,pcm_f32le,pcm_s32le_planar,pcm_s16be_planar,pcm_s16le_planar' demuxers += ',eac3' demuxers += ',mpegts,mpegtsraw,mpegps,mpegvideo' - #demuxers += ',ass,srt' + if get_option('subtitles').enabled() + demuxers += ',ass,srt,webvtt' + muxers += ',ass,srt,webvtt' + endif parsers += 'aac,opus,h264,hevc,av1,vp9' parsers += ',dca' parsers += ',mpegaudio,mpegvideo,dvd_nav' @@ -222,6 +228,10 @@ if demuxers != '' extra_options += ['--enable-demuxer=' + demuxers] endif +if muxers != '' + extra_options += ['--enable-muxer=' + muxers] +endif + if parsers != '' extra_options += ['--enable-parser=' + parsers] endif -- cgit v1.2.3-101-g0448