]> git.sesse.net Git - ffmpeg/commit
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)
commitab7c8e1d6cc976c796735caa1e9210cf06792111
tree3f9edc290815651daf2fcdd454368b0e286c65f1
parent1338cc1ac2933aed04ef3a6adc1f4c305e6b2435
parenta37e84be69310cd7de9540c8bc194cb0a6d158ed
Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'

* commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed':
  makedef: Add support for identifying the ARM64 machine type

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