[FFmpeg-cvslog] Merge commit 'ff7956fcbf8e59b21654b95038de3ed88a850a9e'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Oct 22 21:45:49 2015 +0200| [3c3997188ef945a978792a59c646bfb33cc68a5f] | committer: Hendrik Leppkes

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c3997188ef945a978792a59c646bfb33cc68a5f
---