[FFmpeg-cvslog] Merge commit 'f6772e9bf8251d3943f52f6f34d97d2ce6c4b8af'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 22 15:53:38 2017 +0100| [204b4a7ee2e907ceb79a64e5ad2b91722fc8bc44] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=204b4a7ee2e907ceb79a64e5ad2b91722fc8bc44
---