[FFmpeg-cvslog] avutil/mem_internal: Don't use alignas for MSVC

Zhao Zhili git at videolan.org
Mon Dec 2 14:39:38 EET 2024


ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Sat Nov 30 17:13:25 2024 +0800| [6e49b8699657b808b7dc80033f2c3f2d0e029fa3] | committer: Zhao Zhili

avutil/mem_internal: Don't use alignas for MSVC

MSVC messed up standard C features, again.

Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>
Reviewed-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e49b8699657b808b7dc80033f2c3f2d0e029fa3
---

 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



More information about the ffmpeg-cvslog mailing list