[FFmpeg-cvslog] Merge commit '602abe77b02f9702c18c2787d208fcfc9d94b70f'

[Clément Bœsch]

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

Merge commit '602abe77b02f9702c18c2787d208fcfc9d94b70f'

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

This commit is a noop, see af1761f7b5b1b72197dc40934953b775c2d951cc

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

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