Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'
authorClément Bœsch <u@pkh.me>
Sun, 25 Sep 2016 17:15:44 +0000 (19:15 +0200)
committerClément Bœsch <u@pkh.me>
Sun, 25 Sep 2016 17:15:44 +0000 (19:15 +0200)
* commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3':
  avconv: do not set encoder options when streamcopy is used

This chunk was removed in 955b818cf947473ec94a3fe8aa7f408b119fbbc9
already.

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge