OSDN Git Service

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)
commit99dfa55d5a5a4f8a2fb9dcda9c0283f90db68de9
tree188f2374616a4b2d32e0d2f89f6361816c99bc7e
parent21344991c0d2a651d221dbdbb416031462a70d2c
parent1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3
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@pkh.me>