Merge commit '22f98ac19cf29f22b3e1d10314df9503f06fe683'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:17:38 +0000 (13:17 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:17:38 +0000 (13:17 -0300)
commit03210fe138f3b3bd7f5272fe29aca810cf517329
tree64a2be59ededd292e37447fe8db0f21bbb0ac4ac
parent5c1aafff2d844b177b0b20db4a38d8460992558b
parent22f98ac19cf29f22b3e1d10314df9503f06fe683
Merge commit '22f98ac19cf29f22b3e1d10314df9503f06fe683'

* commit '22f98ac19cf29f22b3e1d10314df9503f06fe683':
  network: Check for EINTR in ff_poll_interrupt

Merged-by: James Almer <jamrial@gmail.com>
libavformat/network.c