[FFmpeg-cvslog] intreadwrite: Use __unaligned in MSVC for ARM64 as well

Martin Storsjö git at videolan.org
Fri Jan 26 00:46:51 EET 2018


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue Jan 16 15:40:24 2018 +0200| [85e10c0a9321bfe0d2afe0f3983ab6a8df6e3fba] | committer: Martin Storsjö

intreadwrite: Use __unaligned in MSVC for ARM64 as well

This attribute is supported for this architecture in MSVC as well
(but produces errors if used for 32 bit x86).

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

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

 libavutil/intreadwrite.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
index 84685f02eb..94abb6cd11 100644
--- a/libavutil/intreadwrite.h
+++ b/libavutil/intreadwrite.h
@@ -192,7 +192,7 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
 #   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
 #   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
 
-#elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_X64)) && AV_HAVE_FAST_UNALIGNED
+#elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_X64) || defined(_M_ARM64)) && AV_HAVE_FAST_UNALIGNED
 
 #   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
 #   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))



More information about the ffmpeg-cvslog mailing list