Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:14:21 +0000 (10:14 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:14:21 +0000 (10:14 +0200)
commit7b89015715046e2a35f584caab2f11625809754c
tree634ebbab363dcf1d8146fdac28e11743d04c1029
parentc223784ea7f320032b8c407815441f98b7241421
parentc778eb15b89d875cb246b18f65b3b4321cb1e7d6
Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'

* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6':
  pixblockdsp: Have function pointer prototype match implementation

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