Merge commit '9835abb6d63fb07613994ae90e72fef758149408'

* commit '9835abb6d63fb07613994ae90e72fef758149408':
  network: uniform ff_listen_bind and ff_listen_connect

Conflicts:
	libavformat/network.c
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 2 insertions, 2 deletions

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 1442f90477..22fc8ce1ea 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -115,13 +115,13 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
 
     if (s->listen) {
         if ((fd = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
-                                 s->listen_timeout)) < 0) {
+                                 s->listen_timeout, h)) < 0) {
             ret = fd;
             goto fail1;
         }
     } else {
         if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
-                                     h->rw_timeout, h)) < 0) {
+                                     h->rw_timeout / 1000, h)) < 0) {
 
             if (ret == AVERROR_EXIT)
                 goto fail1;