diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2026-09-07 15:06:14 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2026-09-07 15:06:14 -0400 |
| commit | c66c7c64ebd16287b892f8a780cffcabafba3799 (patch) | |
| tree | b2195902ef055147878b591cf1171be7e6133c97 /subprojects/packagefiles/ffmpeg/version_4.2.11.diff | |
| parent | 1758ae9e860bd3b65b661e3c804288c3599f4fd4 (diff) | |
| download | camu-c66c7c64ebd16287b892f8a780cffcabafba3799.tar.gz camu-c66c7c64ebd16287b892f8a780cffcabafba3799.tar.bz2 camu-c66c7c64ebd16287b892f8a780cffcabafba3799.zip | |
Better OSD behavior, lots of build stuff
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects/packagefiles/ffmpeg/version_4.2.11.diff')
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/version_4.2.11.diff | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/subprojects/packagefiles/ffmpeg/version_4.2.11.diff b/subprojects/packagefiles/ffmpeg/version_4.2.11.diff index cce132d..94decd2 100644 --- a/subprojects/packagefiles/ffmpeg/version_4.2.11.diff +++ b/subprojects/packagefiles/ffmpeg/version_4.2.11.diff @@ -1,32 +1,21 @@ ---- a/meson.build 2025-11-30 11:51:43.747121512 -0500 -+++ b/meson.build 2025-11-30 12:52:39.981254464 -0500 +--- a/meson.build 2026-09-07 10:14:49.222935216 -0400 ++++ b/meson.build 2026-09-07 10:32:24.949964575 -0400 @@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '4.2.11', meson_version: '>=0.57.0') compiler = meson.get_compiler('c') -@@ -68,18 +68,7 @@ - decoders += ',dca,eac3' - decoders += ',pcm_dvd,mpegvideo,mpeg2video' - #decoders += ',ass,srt' --if get_option('codec-hwaccels').length() == 0 -- if not is_msvc -- libdav1d = dependency('dav1d', required: false) -- if libdav1d.found() -- decoders += ',libdav1d' -- extra_options += ['--enable-libdav1d'] -- deps += [libdav1d] -- endif -- endif --else -- decoders += ',av1' --endif -+decoders += ',av1' - - demuxers = '' - parsers = '' -@@ -290,14 +279,14 @@ +@@ -77,7 +77,7 @@ + if get_option('subtitles').enabled() + decoders += ',ass,srt,webvtt' + endif +-libdav1d = dependency('dav1d', required: false) ++libdav1d = dependency('dav1d', version: '<1.0.0', required: false) + if libdav1d.found() + decoders += ',libdav1d' + extra_options += ['--enable-libdav1d'] +@@ -299,14 +299,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( |