Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 15:53:01 +0000 (17:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 15:53:01 +0000 (17:53 +0200)
* commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a':
  tcp: Use a different log message and level if there's more addresses to try

Conflicts:
libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/network.c
libavformat/network.h
libavformat/tcp.c
libavformat/unix.c

Simple merge
Simple merge
@@@ -127,7 -100,7 +127,7 @@@ static int tcp_open(URLContext *h, cons
          }
      } else {
          if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen,
-                                      s->open_timeout / 1000, h)) < 0) {
 -                                     timeout * 100, h, cur_ai->ai_next)) < 0) {
++                                     s->open_timeout / 1000, h, cur_ai->ai_next)) < 0) {
  
              if (ret == AVERROR_EXIT)
                  goto fail1;
Simple merge