[FFmpeg-cvslog] Merge commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri May 19 12:01:04 2017 +0200| [c909b77fe3646d5891458b6af137667dfbf15eb8] | committer: Clément Bœsch

Merge commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b'

* commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b':
  fifo: Return the correct AVERROR value

This commit is a noop, see 2e81bb5e92351cc88d88a1c55d21b13532131524

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

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