[FFmpeg-cvslog] Merge commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Dec  8 10:03:51 2015 +0100| [c9dbff60c69d5962b4bac47cc0b11e8656d15166] | committer: Hendrik Leppkes

Merge commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81'

* commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81':
  imgconvert: Re-enable the deprecation warnings

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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