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)
* commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364':
  nuv: Replace avpicture functions with imgutils

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

Simple merge