diff options
Diffstat (limited to 'subprojects/packagefiles/ffmpeg/version_3.3.9.diff')
| -rw-r--r-- | subprojects/packagefiles/ffmpeg/version_3.3.9.diff | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff index 90911d5..7e91e5d 100644 --- a/subprojects/packagefiles/ffmpeg/version_3.3.9.diff +++ b/subprojects/packagefiles/ffmpeg/version_3.3.9.diff @@ -1,12 +1,12 @@ ---- a/meson.build 2025-11-30 11:51:43.747121512 -0500 -+++ b/meson.build 2025-11-30 12:55:07.519116860 -0500 +--- a/meson.build 2026-07-02 16:36:02.258920727 -0400 ++++ b/meson.build 2026-07-02 16:49:06.795636508 -0400 @@ -1,4 +1,4 @@ -project('ffmpeg', 'c', version: '', meson_version: '>=0.57.0') +project('ffmpeg', 'c', version: '3.3.9', meson_version: '>=0.57.0') compiler = meson.get_compiler('c') -@@ -35,10 +35,6 @@ +@@ -40,10 +40,6 @@ extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')] endif @@ -17,27 +17,22 @@ extra_options += ['--enable-static', '--disable-shared'] if is_windows -@@ -68,18 +64,7 @@ - decoders += ',dca,eac3' +@@ -74,14 +70,6 @@ decoders += ',pcm_dvd,mpegvideo,mpeg2video' + decoders += ',av1' #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 +-#if get_option('codec-hwaccels').length() == 0 +- libdav1d = dependency('dav1d', required: false) +- if libdav1d.found() +- decoders += ',libdav1d' +- extra_options += ['--enable-libdav1d'] +- deps += [libdav1d] - endif --else -- decoders += ',av1' --endif -+decoders += ',av1' +-#endif demuxers = '' parsers = '' -@@ -195,12 +180,8 @@ +@@ -197,12 +185,8 @@ # Disable unused hwaccels. extra_options += [ @@ -50,7 +45,7 @@ '--disable-nvenc', '--disable-vdpau', '--disable-audiotoolbox', -@@ -243,6 +224,15 @@ +@@ -245,6 +229,15 @@ args += ['-DCAMU_HAVE_SOXR'] endif @@ -66,7 +61,7 @@ ext_proj = import('unstable-external_project') proj = ext_proj.add_project('configure', -@@ -252,7 +242,6 @@ +@@ -254,7 +247,6 @@ '--incdir=@PREFIX@/@INCLUDEDIR@', '--enable-pic', '--disable-all', @@ -74,7 +69,7 @@ '--disable-everything', '--disable-programs', '--disable-doc', -@@ -277,11 +266,14 @@ +@@ -279,11 +271,14 @@ '--enable-swscale', '--disable-indevs', '--disable-outdevs', @@ -89,7 +84,7 @@ avutil = proj.dependency('avutil') avformat = proj.dependency('avformat') avcodec = proj.dependency('avcodec') -@@ -290,14 +282,14 @@ +@@ -292,14 +287,14 @@ swscale = proj.dependency('swscale') include = include_directories('.', 'build/') meson.override_dependency('libavutil', declare_dependency( |