Merge commit '6354957a95022864746180525680cca872ab0e0a'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:21:37 +0000 (10:21 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:21:41 +0000 (10:21 +0200)
commit77248d12181288dd00d1f83fc03649ef14e4dfbe
treecb04bd958f74bac31c559bfa8768ad226151fca4
parent7b89015715046e2a35f584caab2f11625809754c
parent6354957a95022864746180525680cca872ab0e0a
Merge commit '6354957a95022864746180525680cca872ab0e0a'

* commit '6354957a95022864746180525680cca872ab0e0a':
  dnxhdenc: Have function pointer prototype match implementation

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