[FFmpeg-cvslog] Merge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 10 21:29:30 2016 +0100| [6372c9dc9972318e75a5889ad6c52500b8294099] | committer: Derek Buitenhuis

Merge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d'

This commit is a no-op. We already moved it here.

* commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d':
  avconv: switch opening decoders and encoders

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

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