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)
commit204b4a7ee2e907ceb79a64e5ad2b91722fc8bc44
treefacfa46c81f80634f0538304f8e5b86be4b05d20
parent97c17cafab4ecf6df70de4ce19ada325d5b585c3
parentf6772e9bf8251d3943f52f6f34d97d2ce6c4b8af
Merge commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af'

* 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>