Merge commit 'ee59f0540875ab42496af2aacddd942757707683'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:03:59 +0000 (10:03 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:03:59 +0000 (10:03 +0200)
commitb76dd6a6783285ef6549a75b77198388fff0c1e6
tree2acf378d49eef529a5eab2ecfeb71bdf88fdf0e6
parenta48c0c41c4dee06d5d99afd02ebf683135b95f78
parentee59f0540875ab42496af2aacddd942757707683
Merge commit 'ee59f0540875ab42496af2aacddd942757707683'

* commit 'ee59f0540875ab42496af2aacddd942757707683':
  intrax8: Have function signature match across declaration and definition

Merged-by: Clément Bœsch <cboesch@gopro.com>
libavcodec/intrax8.c