Merge branches 'workarounds' and 'bestsource' into feature
This commit is contained in:
commit
6af7c6bddf
3 changed files with 15 additions and 11 deletions
|
@ -137,8 +137,11 @@ BSVideoProvider::BSVideoProvider(agi::fs::path const& filename, std::string cons
|
||||||
if (frame == nullptr) {
|
if (frame == nullptr) {
|
||||||
throw VideoOpenError("Couldn't read frame!");
|
throw VideoOpenError("Couldn't read frame!");
|
||||||
}
|
}
|
||||||
|
#if (LIBAVUTIL_VERSION_MAJOR == 58 && LIBAVUTIL_VERSION_MINOR >= 7) || LIBAVUTIL_VERSION_MAJOR >= 59
|
||||||
|
if (frame->GetAVFrame()->flags & AV_FRAME_FLAG_KEY) {
|
||||||
|
#else
|
||||||
if (frame->GetAVFrame()->key_frame) {
|
if (frame->GetAVFrame()->key_frame) {
|
||||||
|
#endif
|
||||||
Keyframes.push_back(n);
|
Keyframes.push_back(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
[wrap-git]
|
[wrap-git]
|
||||||
directory = ffmpeg
|
directory = ffmpeg
|
||||||
url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
|
url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git
|
||||||
revision = head
|
revision = meson-6.1
|
||||||
|
depth = 1
|
||||||
diff_files = ffmpeg/0001.patch
|
diff_files = ffmpeg/0001.patch
|
||||||
|
|
||||||
[provide]
|
[provide]
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/meson.build b/meson.build
|
diff --git a/meson.build b/meson.build
|
||||||
index 688b368859..dc9d18acd5 100644
|
index 27d1387315..e8d7d3ccc2 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
+++ b/meson.build
|
+++ b/meson.build
|
||||||
@@ -1037,7 +1037,7 @@ check_components = [
|
@@ -1042,7 +1042,7 @@ check_components = [
|
||||||
['user32', ['windows.h', 'winuser.h'], ['GetShellWindow'], ['user32']],
|
['user32', ['windows.h', 'winuser.h'], ['GetShellWindow'], ['user32']],
|
||||||
['vfw32', ['windows.h', 'vfw.h'], ['capCreateCaptureWindow'], ['vfw3']],
|
['vfw32', ['windows.h', 'vfw.h'], ['capCreateCaptureWindow'], ['vfw3']],
|
||||||
['vaapi', ['va/va.h'], ['vaInitialize'], ['va']],
|
['vaapi', ['va/va.h'], ['vaInitialize'], ['va']],
|
||||||
|
@ -11,7 +11,7 @@ index 688b368859..dc9d18acd5 100644
|
||||||
|
|
||||||
# Libraries with preconditions
|
# Libraries with preconditions
|
||||||
['vaapi_drm', ['va/va.h', 'va/va_drm.h'], ['vaGetDisplayDRM'], ['va', 'va-drm'],
|
['vaapi_drm', ['va/va.h', 'va/va_drm.h'], ['vaGetDisplayDRM'], ['va', 'va-drm'],
|
||||||
@@ -1925,6 +1925,7 @@ foreach check : all_checks
|
@@ -1930,6 +1930,7 @@ foreach check : all_checks
|
||||||
prefix = ''
|
prefix = ''
|
||||||
|
|
||||||
found = true
|
found = true
|
||||||
|
@ -19,7 +19,7 @@ index 688b368859..dc9d18acd5 100644
|
||||||
|
|
||||||
preconditions = opts.get('preconditions', [])
|
preconditions = opts.get('preconditions', [])
|
||||||
|
|
||||||
@@ -1980,6 +1981,11 @@ foreach check : all_checks
|
@@ -1985,6 +1986,11 @@ foreach check : all_checks
|
||||||
req = false
|
req = false
|
||||||
endif
|
endif
|
||||||
dep = cc.find_library(link_with, required : req)
|
dep = cc.find_library(link_with, required : req)
|
||||||
|
@ -31,7 +31,7 @@ index 688b368859..dc9d18acd5 100644
|
||||||
found = found and dep.found()
|
found = found and dep.found()
|
||||||
extra_deps += dep
|
extra_deps += dep
|
||||||
endforeach
|
endforeach
|
||||||
@@ -2009,7 +2015,8 @@ foreach check : all_checks
|
@@ -2014,7 +2020,8 @@ foreach check : all_checks
|
||||||
else
|
else
|
||||||
dep = dependency(pkg_name, required : req)
|
dep = dependency(pkg_name, required : req)
|
||||||
endif
|
endif
|
||||||
|
@ -41,7 +41,7 @@ index 688b368859..dc9d18acd5 100644
|
||||||
extra_deps += dep
|
extra_deps += dep
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -2023,14 +2030,14 @@ foreach check : all_checks
|
@@ -2028,14 +2035,14 @@ foreach check : all_checks
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if not conf.has(header.underscorify())
|
if not conf.has(header.underscorify())
|
||||||
|
@ -58,7 +58,7 @@ index 688b368859..dc9d18acd5 100644
|
||||||
n_funcs_found = 0
|
n_funcs_found = 0
|
||||||
foreach symbol : funcs
|
foreach symbol : funcs
|
||||||
if check_type == 'header-func'
|
if check_type == 'header-func'
|
||||||
@@ -2050,7 +2057,7 @@ foreach check : all_checks
|
@@ -2055,7 +2062,7 @@ foreach check : all_checks
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ index 688b368859..dc9d18acd5 100644
|
||||||
n_defines_found = 0
|
n_defines_found = 0
|
||||||
foreach symbol : defines
|
foreach symbol : defines
|
||||||
if cc.get_define(symbol, dependencies : extra_deps, prefix: prefix, args : c_args + project_c_args) != ''
|
if cc.get_define(symbol, dependencies : extra_deps, prefix: prefix, args : c_args + project_c_args) != ''
|
||||||
@@ -2060,15 +2067,15 @@ foreach check : all_checks
|
@@ -2065,15 +2072,15 @@ foreach check : all_checks
|
||||||
found = n_defines_found == defines.length()
|
found = n_defines_found == defines.length()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ index 688b368859..dc9d18acd5 100644
|
||||||
found = cc.has_type(type, prefix : prefix, dependencies : extra_deps, args : c_args + project_c_args)
|
found = cc.has_type(type, prefix : prefix, dependencies : extra_deps, args : c_args + project_c_args)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -3087,6 +3094,11 @@ foreach a: arch_list
|
@@ -3103,6 +3110,11 @@ foreach a: arch_list
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
foreach have: have_list
|
foreach have: have_list
|
||||||
|
|
Loading…
Reference in a new issue