Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'

[ffmpeg] / libavformat / tcp.c

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index bf51701437e2ff45aef863c0dc135e2a99c88133..36af37a94a1b189db85dd00b7fe6807255d7a06d 100644 (file)
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -111,7 +111,9 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
     cur_ai = ai;
 
  restart:
-    fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);
+    fd = ff_socket(cur_ai->ai_family,
+                   cur_ai->ai_socktype,
+                   cur_ai->ai_protocol);
     if (fd < 0) {
         ret = ff_neterrno();
         goto fail;
@@ -125,7 +127,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
         }
     } else {
         if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
-                                     s->open_timeout / 1000, h)) < 0) {
+                                     s->open_timeout / 1000, h, cur_ai->ai_next)) < 0) {
 
             if (ret == AVERROR_EXIT)
                 goto fail1;