mirror of https://git.ffmpeg.org/ffmpeg.git
libavformat/tcp: fix return code for tcp_accept
ff_accept can return AVERROR(ETIMEDOUT) and errno will be 0 (or undefined), return ret instead and return ff_neterror() in ff_poll_interrupt instead of AVERROR(errno) to parse WSAGetLastError on Windows. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
014d47ed74
commit
54b6bef6e1
|
@ -159,7 +159,7 @@ static int ff_poll_interrupt(struct pollfd *p, nfds_t nfds, int timeout,
|
|||
if (!ret)
|
||||
return AVERROR(ETIMEDOUT);
|
||||
if (ret < 0)
|
||||
return AVERROR(errno);
|
||||
return ff_neterrno();
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -204,7 +204,7 @@ static int tcp_accept(URLContext *s, URLContext **c)
|
|||
cc = (*c)->priv_data;
|
||||
ret = ff_accept(sc->fd, sc->listen_timeout, s);
|
||||
if (ret < 0)
|
||||
return ff_neterrno();
|
||||
return ret;
|
||||
cc->fd = ret;
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue