diff options
author | Marton Balint <cus@passwd.hu> | 2020-02-14 23:24:29 +0100 |
---|---|---|
committer | Marton Balint <cus@passwd.hu> | 2020-02-24 00:02:45 +0100 |
commit | c112fae6603f8be33cf1ee2ae390ec939812f473 (patch) | |
tree | 5f38617d905e8390ed2a6bf8c45440a38b81995f /libavformat/libsrt.c | |
parent | aab9133d919bec4af54a06216d8629ebe4fb8f74 (diff) |
avformat/libsrt: poll for error conditions as well
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/libsrt.c')
-rw-r--r-- | libavformat/libsrt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 1ab6c1ddb3..38d047ca88 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -164,16 +164,17 @@ static int libsrt_socket_nonblock(int socket, int enable) static int libsrt_network_wait_fd(URLContext *h, int eid, int fd, int write) { - int ret, len = 1; - int modes = write ? SRT_EPOLL_OUT : SRT_EPOLL_IN; + int ret, len = 1, errlen = 1; + int modes = SRT_EPOLL_ERR | (write ? SRT_EPOLL_OUT : SRT_EPOLL_IN); SRTSOCKET ready[1]; + SRTSOCKET error[1]; if (srt_epoll_add_usock(eid, fd, &modes) < 0) return libsrt_neterrno(h); if (write) { - ret = srt_epoll_wait(eid, 0, 0, ready, &len, POLLING_TIME, 0, 0, 0, 0); + ret = srt_epoll_wait(eid, error, &errlen, ready, &len, POLLING_TIME, 0, 0, 0, 0); } else { - ret = srt_epoll_wait(eid, ready, &len, 0, 0, POLLING_TIME, 0, 0, 0, 0); + ret = srt_epoll_wait(eid, ready, &len, error, &errlen, POLLING_TIME, 0, 0, 0, 0); } if (ret < 0) { if (srt_getlasterror(NULL) == SRT_ETIMEOUT) @@ -181,7 +182,7 @@ static int libsrt_network_wait_fd(URLContext *h, int eid, int fd, int write) else ret = libsrt_neterrno(h); } else { - ret = 0; + ret = errlen ? AVERROR(EIO) : 0; } if (srt_epoll_remove_usock(eid, fd) < 0) return libsrt_neterrno(h); |