Merge commit '18a0f420269ff4c730422361c5c4d8eea096e900'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 21:44:04 +0000 (18:44 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Dec 2017 21:44:04 +0000 (18:44 -0300)
commit5fc649505b2ddb72eee3fcb8611d3d715cd0f718
tree2996d9caa31c2dd6383317c4797d2de8d8035e70
parentb945fed629a872d393f59d16fc5773574126ca88
parent18a0f420269ff4c730422361c5c4d8eea096e900
Merge commit '18a0f420269ff4c730422361c5c4d8eea096e900'

* commit '18a0f420269ff4c730422361c5c4d8eea096e900':
  checkasm: Use LOCAL_ALIGNED for aligned variables on the stack

This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2015-December/184777.html

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