Merge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:56:44 +0000 (19:56 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:56:44 +0000 (19:56 +0000)
commit54f49bd3781cde3a152772067531016219e4dcbc
treee1e7ccc2ee20f7071bcd4a7b1f897d11a60e05b6
parent3662e55943d3b3dd351eb683f5abfbca01952f5c
parent9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6
Merge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/imgconvert.c