Merge commit '1e93c1e30f'
* commit '1e93c1e30f': avconv: do not set encoder options when streamcopy is used This chunk was removed in955b818cf9already. Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
99dfa55d5a