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)
commit3c3997188ef945a978792a59c646bfb33cc68a5f
tree2d2c47a5c9748a2f0374bbcf946816c1bb3f3d46
parentce9736362896708d872587830efa10e4cee9a6cf
parentff7956fcbf8e59b21654b95038de3ed88a850a9e
Merge commit 'ff7956fcbf8e59b21654b95038de3ed88a850a9e'

* 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>