[FFmpeg-cvslog] Merge commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Mar 18 19:59:48 2017 +0100| [55dae222a0b359a96b86356143f44718f67a9fa0] | committer: Clément Bœsch

Merge commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5'

* commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5':
  avconv: Make sure that inputless filtergraphs are configured

This commit is a noop. Related code is pretty different in ffmpeg, and
-filter_complex testsrc works.

See also af1761f7b5b1b72197dc40934953b775c2d951cc

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

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