Merge commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b'
authorClément Bœsch <u@pkh.me>
Fri, 19 May 2017 10:01:04 +0000 (12:01 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 19 May 2017 10:01:04 +0000 (12:01 +0200)
* commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b':
  fifo: Return the correct AVERROR value

This commit is a noop, see 2e81bb5e92351cc88d88a1c55d21b13532131524

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

Trivial merge