]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:59:36 +0000 (16:59 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:59:36 +0000 (16:59 -0300)
* commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed':
  makedef: Add support for identifying the ARM64 machine type

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge