Merge commit '48c06386831604921bdaf4fb77ea02766cd615f4'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 18:31:09 +0000 (20:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 18:31:09 +0000 (20:31 +0200)
commit8fe1433ad4f866df58c0862f0d13535c96e90d63
tree819ec0c44d8ecf005ad300d0ad8eba1ad0d69359
parentef4fbee79df6b3835bef36bbe59bdc7c834676f2
parent48c06386831604921bdaf4fb77ea02766cd615f4
Merge commit '48c06386831604921bdaf4fb77ea02766cd615f4'

* commit '48c06386831604921bdaf4fb77ea02766cd615f4':
  dpx: Replace avpicture functions with imgutils

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