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)
commite3b81d2d9bd868c3b94a9ee1436f3a7c9de5f7c2
tree6790692d0ea809c1531736d25aea6544d0e35844
parent9821aa7d3890e4f8e4e43968953e847a21d49839
parent602abe77b02f9702c18c2787d208fcfc9d94b70f
Merge commit '602abe77b02f9702c18c2787d208fcfc9d94b70f'

* commit '602abe77b02f9702c18c2787d208fcfc9d94b70f':
  avconv: Check the fifo allocation

This commit is a noop, see af1761f7b5b1b72197dc40934953b775c2d951cc

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