[FFmpeg-cvslog] avutil/mem_internal: Don't include stdalign.h on MSVC

Martin Storsjö git at videolan.org
Wed Dec 18 16:05:18 EET 2024


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue Dec 17 14:47:28 2024 +0200| [d1e37eb0cd9a551383ae675418015c16d6ce1731] | committer: Martin Storsjö

avutil/mem_internal: Don't include stdalign.h on MSVC

It's currently actually not used in MSVC builds, since
6e49b8699657b808b7dc80033f2c3f2d0e029fa3.

Older versions of MSVC (or, in particular, older versions of UCRT)
don't have stdalign.h; it's available since WinSDK 10.0.20348.0;
such a new enough version has been installed by default only since
MSVC 2022 17.4 and newer.

With this change, ffmpeg can still be built with MSVC 2019 16.8
(v19.28).

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavutil/mem_internal.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h
index 2eb4aef5b0..c027fa51c3 100644
--- a/libavutil/mem_internal.h
+++ b/libavutil/mem_internal.h
@@ -24,7 +24,9 @@
 #include "config.h"
 
 #include <stdint.h>
+#ifndef _MSC_VER
 #include <stdalign.h>
+#endif
 
 #include "attributes.h"
 #include "macros.h"



More information about the ffmpeg-cvslog mailing list