Merge commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Dec 2015 09:03:51 +0000 (10:03 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Dec 2015 09:03:51 +0000 (10:03 +0100)
commitc9dbff60c69d5962b4bac47cc0b11e8656d15166
tree1d88791f0fd04541209b67c4bcf9e22c3e6cbf6e
parent68cb0dc8a3e8acec047ed078cd2c021d4dd94024
parent7d36474d1908d6267d4e11d4d9909f9604bd0c81
Merge commit '7d36474d1908d6267d4e11d4d9909f9604bd0c81'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/imgconvert.c