Merge commit 'ff7956fcbf8e59b21654b95038de3ed88a850a9e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 19:45:49 +0000 (21:45 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 19:45:49 +0000 (21:45 +0200)
* commit 'ff7956fcbf8e59b21654b95038de3ed88a850a9e':
  avplay: Replace avpicture functions with imgutils

avplay and ffplay have diverged quite a bit, and ffplay should be updated
independently.

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

Trivial merge