Merge commit 'b420a27e74750b60d2e064236afb10be06a38ace'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 18:44:19 +0000 (15:44 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 18:44:19 +0000 (15:44 -0300)
commit2508e606fba86f2e460eebb045e29e1f069a4d72
tree4293101789a828c1aeee30c4988158d4d65fcf6d
parent475ff3ec2487c7a2e3a835755cbb0fdc97daacb8
parentb420a27e74750b60d2e064236afb10be06a38ace
Merge commit 'b420a27e74750b60d2e064236afb10be06a38ace'

* commit 'b420a27e74750b60d2e064236afb10be06a38ace':
  avconv: allow -b to be used with streamcopy

This commit is a noop. We already have this functionality.

Merged-by: James Almer <jamrial@gmail.com>