diff options
| author | Mark Thompson <sw@jkqxz.net> | 2018-01-25 22:45:45 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-01-25 22:45:45 +0000 |
| commit | 8e9be8ffba03d3327ca1aaf0b1a5f3e2458ea285 (patch) | |
| tree | 9b350198ec3ac4bd32530b0425cce2663725d800 | |
| parent | ee88f31d34c848fd95daf12bdf054b7228efdf14 (diff) | |
| parent | 85e10c0a9321bfe0d2afe0f3983ab6a8df6e3fba (diff) | |
| download | ffmpeg-8e9be8ffba03d3327ca1aaf0b1a5f3e2458ea285.tar.gz | |
Merge commit '85e10c0a9321bfe0d2afe0f3983ab6a8df6e3fba'
* commit '85e10c0a9321bfe0d2afe0f3983ab6a8df6e3fba':
intreadwrite: Use __unaligned in MSVC for ARM64 as well
Merged-by: Mark Thompson <sw@jkqxz.net>
| -rw-r--r-- | libavutil/intreadwrite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 0c0309b4a7..67c763b135 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -224,7 +224,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)) |