diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 17:53:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 17:53:01 +0200 |
| commit | 89efaabc9949dcdc49126881beaa38355b8f9a44 (patch) | |
| tree | 61bc2709d50bc13b2670323656d20bab79e6ee16 /libavformat/tcp.c | |
| parent | 287f7d0ae1267bf5e505d4173f5a4cb77f433c66 (diff) | |
| parent | abe5268c3328bf0e8fcfb7dc6e231b8920177c3a (diff) | |
| download | ffmpeg-89efaabc9949dcdc49126881beaa38355b8f9a44.tar.gz | |
Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'
* 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>
Diffstat (limited to 'libavformat/tcp.c')
| -rw-r--r-- | libavformat/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c index c2a76cb710..36af37a94a 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -127,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; |