Merge commit '1e93c1e3'

* commit '1e93c1e3':
  avconv: do not set encoder options when streamcopy is used

This chunk was removed in 955b818c
already.
Merged-by: Clément Bœsch <u@pkh.me>