[FFmpeg-cvslog] Merge commit '63ac8e2d93080b74f6be32c7c3c1a1e44aacf34e'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 15 22:13:41 2017 -0300| [b5122b040fe9441871b3d275d7f5e9eb352d4f28] | committer: James Almer

Merge commit '63ac8e2d93080b74f6be32c7c3c1a1e44aacf34e'

* commit '63ac8e2d93080b74f6be32c7c3c1a1e44aacf34e':
  lavu: add LOCAL_ALIGNED_32

This commit is a noop, see 25d5ea6d5a08820a40dd145d40ddfaecdb44837b

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

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