[svt-av1] Work around Visual Studio 2026 MSVC bug (#52469)

This commit is contained in:
Wan-Teh Chang 2026-06-18 21:12:33 -07:00 committed by GitHub
parent 36393d1ca0
commit a900048467
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,19 @@
diff --git a/Source/Lib/ASM_AVX2/synonyms_avx2.h b/Source/Lib/ASM_AVX2/synonyms_avx2.h
index f615e2569..9a7667724 100644
--- a/Source/Lib/ASM_AVX2/synonyms_avx2.h
+++ b/Source/Lib/ASM_AVX2/synonyms_avx2.h
@@ -75,7 +75,13 @@ static INLINE __m256i yy_loadu2_128(const void *hi, const void *lo) {
return yy_set_m128i(mhi, mlo);
}
-static INLINE __m256i yy_unpacklo_epi128(const __m256i in0, const __m256i in1) {
+#if defined(_MSC_VER) && _MSC_VER >= 1950
+#define MAYBE_INLINE NOINLINE
+#else
+#define MAYBE_INLINE INLINE
+#endif
+
+static MAYBE_INLINE __m256i yy_unpacklo_epi128(const __m256i in0, const __m256i in1) {
return _mm256_inserti128_si256(in0, _mm256_castsi256_si128(in1), 1);
}

View File

@ -6,6 +6,7 @@ vcpkg_from_gitlab(
SHA512 4301e923965e3bff30a0fd2f74ae023d19260f91c2361d48ea7bc1718f501dcca73fa17cb8795b23392ca1bfbe1f4d55edcbb5ce06a2fa9e41da36c5166f527d
PATCHES
no-force-llvm.diff
no-inline-yy_unpacklo_epi128.diff
no-safestringlib.diff
unvendor-fastfeat.diff
)

View File

@ -1,6 +1,7 @@
{
"name": "svt-av1",
"version-semver": "3.1.2",
"port-version": 1,
"description": "AV1 software video encoder library",
"homepage": "https://gitlab.com/AOMediaCodec/SVT-AV1",
"license": "BSD-3-Clause",

View File

@ -9934,7 +9934,7 @@
},
"svt-av1": {
"baseline": "3.1.2",
"port-version": 0
"port-version": 1
},
"swaggercpp": {
"baseline": "0.3.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1a94cc62d7d93d05b2c5033681b592342021672f",
"version-semver": "3.1.2",
"port-version": 1
},
{
"git-tree": "dfc35e8860de9551f35b4cb0eb5c10898c2edfdb",
"version-semver": "3.1.2",