Merge commit 'ff7956fc'

* commit 'ff7956fc':
  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>