Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'

Browse Source

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

This chunk was removed in 955b818cf9
already.

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

...

This commit is contained in:

Clément Bœsch 2016-09-25 19:15:44 +02:00

parent 21344991c0 1e93c1e30f

commit 99dfa55d5a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available