Merge commit '0705f596'

This commit is a no-op. We did this already in 9e0d1c00.

* commit '0705f596':
  avplay: do not use AVStream.codec for decoding
Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>