diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 00:28:28 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-18 00:28:28 +0400 |
commit | 6ca48ad044e690c43985aa380cb474f1a3df7b4e (patch) | |
tree | 47a311223209a8edd05242cf417d6b6c61bd83b6 /libavformat/tcp.c | |
parent | 54101214d89382a24518f21a30080631a981c798 (diff) | |
parent | 5f26d4d44896542e729c7515c784d983e396106a (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
amr: Cosmetic cleanup
mov_chan: Fix operator precedence by adding parentheses
doc: Add missing protocols to list of supported protocols.
tcp: Check the listen call
Conflicts:
libavformat/amr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tcp.c')
-rw-r--r-- | libavformat/tcp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c index a46957eb47..1cc7e0a6be 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -90,7 +90,11 @@ static int tcp_open(URLContext *h, const char *uri, int flags) ret = ff_neterrno(); goto fail1; } - listen(fd, 1); + ret = listen(fd, 1); + if (ret) { + ret = ff_neterrno(); + goto fail1; + } fd1 = accept(fd, NULL, NULL); if (fd1 < 0) { ret = ff_neterrno(); |