Merge commit '602abe77b02f9702c18c2787d208fcfc9d94b70f'
authorClément Bœsch <u@pkh.me>
Sat, 18 Mar 2017 18:45:11 +0000 (19:45 +0100)
committerClément Bœsch <u@pkh.me>
Sat, 18 Mar 2017 18:45:11 +0000 (19:45 +0100)
* commit '602abe77b02f9702c18c2787d208fcfc9d94b70f':
  avconv: Check the fifo allocation

This commit is a noop, see af1761f7b5b1b72197dc40934953b775c2d951cc

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

Trivial merge