Merge commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5'
authorClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 13:09:19 +0000 (15:09 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 29 Mar 2017 13:09:26 +0000 (15:09 +0200)
commita51867ee6bc717a54ea2436e31ee626f02fdf25d
tree836d43cc18fa7dad39e2f9e544fb0a1a53e4dcfa
parentd467740f45eb20e217de6bc6b9c91d57d6f8a88e
parentbaab87c4f30e75ea309294b06adcd01ce678bdc5
Merge commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5'

* commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5':
  bink: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/binkdsp.h