Merge commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5'
authorClément Bœsch <u@pkh.me>
Sat, 18 Mar 2017 18:59:48 +0000 (19:59 +0100)
committerClément Bœsch <u@pkh.me>
Sat, 18 Mar 2017 19:00:06 +0000 (20:00 +0100)
commit55dae222a0b359a96b86356143f44718f67a9fa0
tree6790692d0ea809c1531736d25aea6544d0e35844
parente3b81d2d9bd868c3b94a9ee1436f3a7c9de5f7c2
parentf6d2fed811dea36c4ebaf991927e44c78eb0aca5
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@pkh.me>