[FFmpeg-cvslog] Merge commit 'c194b9ad6dbe65f5abd68158c4811ed84e2a2b95'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 11 13:15:41 2018 -0300| [5c1aafff2d844b177b0b20db4a38d8460992558b] | committer: James Almer

Merge commit 'c194b9ad6dbe65f5abd68158c4811ed84e2a2b95'

* commit 'c194b9ad6dbe65f5abd68158c4811ed84e2a2b95':
  network: Use ff_neterrno instead of AVERROR(errno) for poll errors

This commit is a noop, see 54b6bef6e13adf377c78c28ede22a4322ab28865

Merged-by: James Almer <jamrial at gmail.com>

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