[FFmpeg-cvslog] Merge commit '892f037c55d86ce36f8705fbeab052189312a13e'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Jan 27 19:58:35 2016 +0000| [fa48cd8814e790d837179f8336d129ea1c2f9f8c] | committer: Derek Buitenhuis

Merge commit '892f037c55d86ce36f8705fbeab052189312a13e'

* commit '892f037c55d86ce36f8705fbeab052189312a13e':
  imgconvert: Move the shrink functions only where needed

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

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