Merge commit '0705f5960c9d272cef1309c090000865b991c9c7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:48:24 +0000 (21:48 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:49:00 +0000 (21:49 +0100)
This commit is a no-op. We did this already in 9e0d1c00b5832e80dc11368e3d39f9e2ec9346f1.

* commit '0705f5960c9d272cef1309c090000865b991c9c7':
  avplay: do not use AVStream.codec for decoding

Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>

Trivial merge