[FFmpeg-cvslog] Merge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Jan 27 19:56:44 2016 +0000| [54f49bd3781cde3a152772067531016219e4dcbc] | committer: Derek Buitenhuis

Merge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6'

* commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6':
  imgconvert: Drop outdated comment block

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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