]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'f79d847400d218cfd0b95f10358fe6e65ec3c9c4'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:20:44 +0000 (21:20 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:20:44 +0000 (21:20 -0300)
* commit 'f79d847400d218cfd0b95f10358fe6e65ec3c9c4':
  intreadwrite: Use the __unaligned keyword on MSVC for ARM and x86_64

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavutil/intreadwrite.h

Simple merge