Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:28:35 +0000 (16:28 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:28:35 +0000 (16:28 -0300)
commita4ee9551138c8ba7b93c098cacc867d2e9ee95d1
treeae699dbdfa6a208eb05893a185e75253c813bb46
parent8e7497e774af8f2f26c4b0fd007bafabb1255e34
parent8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67
Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'

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

This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee

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