[FFmpeg-cvslog] Merge commit '18a0f420269ff4c730422361c5c4d8eea096e900'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Dec 14 18:44:04 2017 -0300| [5fc649505b2ddb72eee3fcb8611d3d715cd0f718] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fc649505b2ddb72eee3fcb8611d3d715cd0f718
---