Merge commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af'
authorClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 14:53:38 +0000 (15:53 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 14:53:38 +0000 (15:53 +0100)
* commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af':
  avconv: make sure the filtergraph is freed on init failure

This commit is a noop, see 16abc10b0997c76cbb0c0ebedc49f6bc21452f9d

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

Trivial merge