diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
| commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
| tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /stream/tcp.c | |
| parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
| parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
| download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz | |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'stream/tcp.c')
| -rw-r--r-- | stream/tcp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/stream/tcp.c b/stream/tcp.c index 1bc536d41a..2222cca1db 100644 --- a/stream/tcp.c +++ b/stream/tcp.c @@ -99,6 +99,14 @@ connect2Server_with_af(char *host, int port, int af,int verb) { struct timeval to; #endif +#if HAVE_WINSOCK2_H && defined(HAVE_AF_INET6) + // our winsock name resolution code can not handle IPv6 + if (af == AF_INET6) { + mp_msg(MSGT_NETWORK, MSGL_WARN, "IPv6 not supported for winsock2\n"); + return TCP_ERROR_FATAL; + } +#endif + socket_server_fd = socket(af, SOCK_STREAM, 0); |