[FFmpeg-cvslog] Merge commit '0705f5960c9d272cef1309c090000865b991c9c7'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 10 21:48:24 2016 +0100| [bc91bc1d8b2baa29267b5181d805f5286466cade] | committer: Derek Buitenhuis

Merge commit '0705f5960c9d272cef1309c090000865b991c9c7'

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

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