]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '63ac8e2d93080b74f6be32c7c3c1a1e44aacf34e'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 01:13:41 +0000 (22:13 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 01:13:41 +0000 (22:13 -0300)
* commit '63ac8e2d93080b74f6be32c7c3c1a1e44aacf34e':
  lavu: add LOCAL_ALIGNED_32

This commit is a noop, see 25d5ea6d5a08820a40dd145d40ddfaecdb44837b

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

Trivial merge