ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Mar 15 21:20:44 2017 -0300| [30fe4b8d4ce2ae0272f983f454a94f27b62f8c67] | committer: James Almer
Merge commit 'f79d847400d218cfd0b95f10358fe6e65ec3c9c4' * commit 'f79d847400d218cfd0b95f10358fe6e65ec3c9c4': intreadwrite: Use the __unaligned keyword on MSVC for ARM and x86_64 Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30fe4b8d4ce2ae0272f983f454a94f27b62f8c67 --- libavutil/intreadwrite.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 89d25ac..d54d4b9 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -229,6 +229,11 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias; # define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p))) # define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v)) +#elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_X64)) && 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)) + #elif AV_HAVE_FAST_UNALIGNED # define AV_RN(s, p) (((const av_alias##s*)(p))->u##s) ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
