Merge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:29:30 +0000 (21:29 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 10 Apr 2016 20:29:30 +0000 (21:29 +0100)
commit6372c9dc9972318e75a5889ad6c52500b8294099
tree0c2ec8349ff1763d5f48454b8b9f26374dbd80b0
parent6f69f7a8bf6a0d013985578df2ef42ee6b1c7994
parent5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d
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@gmail.com>