[FFmpeg-cvslog] Merge commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 23 00:13:18 2014 +0200| [4b6bb7bfe18f10c6e5b434559ca1cf98268c2704] | committer: Michael Niedermayer

Merge commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b'

* commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b':
  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 at gmx.at>

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