From c66c7c64ebd16287b892f8a780cffcabafba3799 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 7 Sep 2026 15:06:14 -0400 Subject: Better OSD behavior, lots of build stuff Signed-off-by: Andrew Opalach --- subprojects/packagefiles/ffmpeg/meson.build | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'subprojects/packagefiles/ffmpeg/meson.build') diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index aa881bc..f19204a 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -77,20 +77,18 @@ decoders += ',av1' 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() - decoders += ',libdav1d' - extra_options += ['--enable-libdav1d'] - deps += [libdav1d] - endif -#endif +libdav1d = dependency('dav1d', required: false) +if libdav1d.found() + decoders += ',libdav1d' + extra_options += ['--enable-libdav1d'] + deps += [libdav1d] +endif demuxers = '' muxers = '' parsers = '' if not get_option('sink-only') - demuxers += 'flac,mp3,aac,wav,matroska,mov,avi' + demuxers += ',flac,mp3,aac,wav,matroska,mov,avi' demuxers += ',pcm_s32be,pcm_s32le,pcm_s24be,pcm_s24le,pcm_s16be,pcm_s16le' #demuxers += ',pcm_f32be,pcm_f32le,pcm_s32le_planar,pcm_s16be_planar,pcm_s16le_planar' demuxers += ',eac3' @@ -99,7 +97,7 @@ if not get_option('sink-only') demuxers += ',ass,srt,webvtt' muxers += ',ass,srt,webvtt' endif - parsers += 'aac,opus,h264,hevc,av1,vp9' + parsers += ',aac,opus,h264,hevc,av1,vp9' parsers += ',dca' parsers += ',mpegaudio,mpegvideo,dvd_nav' bzlib = dependency('bzip2', required: false) @@ -128,7 +126,7 @@ extra_options += ['--disable-xlib'] bsfs = '' if not get_option('sink-only') - bsfs += 'extract_extradata,mp3_header_decompress' + bsfs += ',extract_extradata,mp3_header_decompress' endif hwaccels = '' -- cgit v1.2.3-101-g0448