[FFmpeg-cvslog] Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 10 21:49:15 2016 +0100| [972df59f4f4d30e44e5544c4f1aa43ef83a19757] | committer: Derek Buitenhuis

Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70'

This commit is a no-op. We want to do this ourselves since avplay and
ffplay differ quite a bit.

* commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70':
  avplay: convert do codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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