[FFmpeg-cvslog] Merge commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 16:25:23 2017 -0300| [8e7497e774af8f2f26c4b0fd007bafabb1255e34] | committer: James Almer

Merge commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125'

* commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125':
  nut: Use correct function pointer casts instead of void*

This commit is a noop. Casts are not needed.

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e7497e774af8f2f26c4b0fd007bafabb1255e34
---