Fix vcr memory leak, subtitle upload/render sync

 - Some sink behavior fixes.
 - Fix clock sync when seeking.
 - Add relative seek bind.

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 12 insertions, 6 deletions

diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build
index 04533f8..8aa2f02 100644
--- a/subprojects/packagefiles/ffmpeg/meson.build
+++ b/subprojects/packagefiles/ffmpeg/meson.build
@@ -1,4 +1,4 @@
-project('ffmpeg', 'c', version: '7.1', meson_version: '>=0.57.0')
+project('ffmpeg', 'c', version: '7.1.1', meson_version: '>=0.57.0')
 
 ffmpeg_version_string = meson.project_version()
 
@@ -6,8 +6,8 @@ compiler = meson.get_compiler('c')
 
 cpu = target_machine.cpu_family()
 is_64bit = (cpu == 'x86_64' or cpu == 'aarch64')
-is_debug = get_option('buildtype').startswith('debug')
-is_minsize = get_option('buildtype') == 'minsize'
+is_debug = get_option('debug')
+is_minsize = get_option('optimization') == 's'
 is_linux = host_machine.system() == 'linux'
 is_windows = host_machine.system() == 'windows'
 is_msvc = compiler.get_id() == 'msvc' or compiler.get_id() == 'clang-cl'
@@ -20,10 +20,16 @@ if not is_debug
   extra_options += ['--disable-debug']
 endif
 
+if is_minsize
+  extra_options += ['--enable-small']
+endif
+
 extra_options += ['--cc=' + compiler.cmd_array()[0]]
 extra_options += ['--arch=' + cpu]
-extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
-extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')]
+if meson.is_cross_build()
+  extra_options += ['--nm=' + meson.get_external_property('nm', 'nm')]
+  extra_options += ['--ar=' + meson.get_external_property('ar', 'ar')]
+endif
 
 if cpu == 'x86_64' or cpu == 'x86'
   extra_options += ['--enable-x86asm']
@@ -90,7 +96,7 @@ endif
 
 protocols = 'file,cache'
 
-if not is_android
+if is_linux or is_mingw
   extra_options += ['--enable-libsoxr']
 endif