From 6e49b8699657b808b7dc80033f2c3f2d0e029fa3 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Sat, 30 Nov 2024 17:13:25 +0800 Subject: [PATCH] avutil/mem_internal: Don't use alignas for MSVC MSVC messed up standard C features, again. Signed-off-by: Zhao Zhili Reviewed-by: James Almer --- libavutil/mem_internal.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h index 249ec3a642..2eb4aef5b0 100644 --- a/libavutil/mem_internal.h +++ b/libavutil/mem_internal.h @@ -78,6 +78,10 @@ #define DECLARE_ALIGNED_T(n,t,v) alignas(FFMIN(n, 16)) t v #define DECLARE_ASM_ALIGNED(n,t,v) alignas(FFMIN(n, 16)) t av_used v #define DECLARE_ASM_CONST(n,t,v) alignas(FFMIN(n, 16)) static const t av_used v +#elif defined(_MSC_VER) + #define DECLARE_ALIGNED_T(n,t,v) __declspec(align(n)) t v + #define DECLARE_ASM_ALIGNED(n,t,v) __declspec(align(n)) t v + #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v #else #define DECLARE_ALIGNED_T(n,t,v) alignas(n) t v #define DECLARE_ASM_ALIGNED(n,t,v) alignas(n) t av_used v