Merge commit '892f037c55d86ce36f8705fbeab052189312a13e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:58:35 +0000 (19:58 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:58:35 +0000 (19:58 +0000)
commitfa48cd8814e790d837179f8336d129ea1c2f9f8c
tree20b1efb162aeff88ac9b7e5f7c8c9f6a008f0531
parent54f49bd3781cde3a152772067531016219e4dcbc
parent892f037c55d86ce36f8705fbeab052189312a13e
Merge commit '892f037c55d86ce36f8705fbeab052189312a13e'

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

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