]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '163cc67beb3ed28aeb500c9a09df47c8df613025'
authorJames Almer <jamrial@gmail.com>
Tue, 24 Oct 2017 22:25:05 +0000 (19:25 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 24 Oct 2017 22:25:05 +0000 (19:25 -0300)
* commit '163cc67beb3ed28aeb500c9a09df47c8df613025':
  takdec: Use ISO C printf conversion specifiers where appropriate
  dcadec: remove extra indirection
  hevcdec: Use LOCAL_ALIGNED_* for declaring local variables with alignment
  arm: Always build the hevcdsp_init_arm.c file

This commit is a noop.

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

Trivial merge