RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

libavformat/tcp: fix return code for tcp_accept

Browse Source 
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:
Simon Thelen 2017-04-08 14:21:28 +02:00 committed by Michael Niedermayer
parent 014d47ed74
commit 54b6bef6e1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/network.c
View File

@ -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;
}

2
libavformat/tcp.c
View File

@ -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;
}