[FFmpeg-cvslog] Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Sep 25 19:15:44 2016 +0200| [99dfa55d5a5a4f8a2fb9dcda9c0283f90db68de9] | committer: Clément Bœsch

Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'

* 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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99dfa55d5a5a4f8a2fb9dcda9c0283f90db68de9
---