Merge commit '296eff4d9dc53d441b672319524a051d04f4a8cf'

[ffmpeg] / libavformat / tcp.c

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 3055e48015f7df09652339d7f64ab9b07569bc2c..07b4ed9fa3a8e0b0cb31486642e5d1dc40a334dc 100644 (file)
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -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;
 }