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)
* commit 'ee59f0540875ab42496af2aacddd942757707683':
  intrax8: Have function signature match across declaration and definition

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

Simple merge