Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:47:26 +0000 (21:47 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:47:26 +0000 (21:47 +0100)
commitbbf5ef9dac9475d8ed22da23acc2eb63a2640784
tree0c2ec8349ff1763d5f48454b8b9f26374dbd80b0
parent6372c9dc9972318e75a5889ad6c52500b8294099
parent15e84ed3f141c586e8cb78ed58365cf5a511108a
Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'

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

* commit '15e84ed3f141c586e8cb78ed58365cf5a511108a':
  avconv: convert to codecpar

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