]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6':
  imgconvert: Drop outdated comment block

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

Simple merge