Merge commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 18:32:07 +0000 (20:32 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 18:32:07 +0000 (20:32 +0200)
commit422fab7fbe512afa6287fa816407f84e6dc54ae5
tree029ea93c8917613042b930fc8a8217c7a012e6d4
parent8fe1433ad4f866df58c0862f0d13535c96e90d63
parent13bddab7de10aebf6efb98aa6d7ff0c51bb0e364
Merge commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364'

* commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364':
  nuv: Replace avpicture functions with imgutils

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