[FFmpeg-cvslog] Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 16:28:35 2017 -0300| [a4ee9551138c8ba7b93c098cacc867d2e9ee95d1] | committer: James Almer

Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'

* commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67':
  vf_drawtext: Drop wrong void* cast

This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee

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

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