Merge commit '15e84ed3'

This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.

* commit '15e84ed3':
  avconv: convert to codecpar
Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>