diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:53:01 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:53:01 +0400 |
commit | 89efaabc9949dcdc49126881beaa38355b8f9a44 (patch) | |
tree | 61bc2709d50bc13b2670323656d20bab79e6ee16 /libavformat/network.h | |
parent | 287f7d0ae1267bf5e505d4173f5a4cb77f433c66 (diff) | |
parent | abe5268c3328bf0e8fcfb7dc6e231b8920177c3a (diff) |
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/network.h')
-rw-r--r-- | libavformat/network.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index 6552f83fc9..4b5398a12c 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -251,11 +251,14 @@ int ff_listen_bind(int fd, const struct sockaddr *addr, * @param timeout Polling timeout in milliseconds. * @param h URLContext providing interrupt check * callback and logging context. + * @param will_try_next Whether the caller will try to connect to another + * address for the same host name, affecting the form of + * logged errors. * @return 0 on success, AVERROR on failure. */ int ff_listen_connect(int fd, const struct sockaddr *addr, socklen_t addrlen, int timeout, - URLContext *h); + URLContext *h, int will_try_next); int ff_http_match_no_proxy(const char *no_proxy, const char *hostname); |