[FFmpeg-cvslog] lavc/refstruct: do not use max_align_t on MSVC

James Almer git at videolan.org
Fri Feb 9 17:28:30 EET 2024


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Feb  5 19:48:26 2024 +0100| [7c873fb2985f94da61eb7b41c90176fa471e6163] | committer: Anton Khirnov

lavc/refstruct: do not use max_align_t on MSVC

It is not available there, even when C11/17 is requested.

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 libavcodec/refstruct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/refstruct.c b/libavcodec/refstruct.c
index 7597f6d0ee..81e8c9795c 100644
--- a/libavcodec/refstruct.c
+++ b/libavcodec/refstruct.c
@@ -45,7 +45,7 @@
 #define REFSTRUCT_COOKIE AV_NE((uint64_t)MKBETAG('R', 'e', 'f', 'S') << 32 | MKBETAG('t', 'r', 'u', 'c'), \
                                MKTAG('R', 'e', 'f', 'S') | (uint64_t)MKTAG('t', 'r', 'u', 'c') << 32)
 
-#if __STDC_VERSION__ >= 201112L
+#if __STDC_VERSION__ >= 201112L && !defined(_MSC_VER)
 #define REFCOUNT_OFFSET FFALIGN(sizeof(RefCount), FFMAX3(STRIDE_ALIGN, 16, _Alignof(max_align_t)))
 #else
 #define REFCOUNT_OFFSET FFALIGN(sizeof(RefCount), FFMAX(STRIDE_ALIGN, 16))



More information about the ffmpeg-cvslog mailing list