Merge commit '5b9cdf8c'

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

* commit '5b9cdf8c':
  avconv: switch opening decoders and encoders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>