Merge commit '9155c595'

* commit '9155c595':
  fic: Support rendering cursors

Not merged as the commit is missing changes that where replied to with "done" on ffmpeg-devel
Merged-by: Michael Niedermayer <michaelni@gmx.at>