Merge commit 'c23152a9'

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

* commit 'c23152a9':
  avplay: convert do codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>