[FFmpeg-cvslog] Merge commit '4d0d55cd623bcd504867f948849380f6b4060b4d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 26 11:39:09 2015 +0200| [ce466275f8d62dd8c20923c59cb0476cc0bd9e0f] | committer: Michael Niedermayer

Merge commit '4d0d55cd623bcd504867f948849380f6b4060b4d'

* commit '4d0d55cd623bcd504867f948849380f6b4060b4d':
  checkasm: Use LOCAL_ALIGNED

See: f467fc02b475cd45b68aa5fb5f7c78286110ba86
See: 9e83ac6114de3d94eb992eff8ed810234069a7b2
Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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