Merge commit 'c194b9ad6dbe65f5abd68158c4811ed84e2a2b95'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:15:41 +0000 (13:15 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:15:41 +0000 (13:15 -0300)
commit5c1aafff2d844b177b0b20db4a38d8460992558b
tree4919aea43a079f35a8945041e876e388c1679c0c
parent1a8be90adbaf86faa3053ff98118004ad7711c8c
parentc194b9ad6dbe65f5abd68158c4811ed84e2a2b95
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@gmail.com>