Merge commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8'
authorJames Almer <jamrial@gmail.com>
Wed, 11 Oct 2017 22:44:56 +0000 (19:44 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 11 Oct 2017 22:44:56 +0000 (19:44 -0300)
* commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8':
  Add Apple Pixlet decoder
  libavutil: add av_mod_uintp2
  intmath: add faster clz support

This commit is a noop, see
0dd8a3d71e2c01d42e868d6c6b8974fadfcc529e
d13e521cc861e791545dd6022fbf93f821e33618
73651090ca1183f37753ee30a7e206ca4fb9f4f0

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

Trivial merge