diff options
| author | Martin Storsjö <martin@martin.st> | 2017-05-31 13:08:29 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2017-06-01 13:29:55 +0300 |
| commit | 2ca759657bcda328acc312e5882a940333a3e268 (patch) | |
| tree | 98b6161aac9d6f2bc4a256422d572942717cce59 /libavformat | |
| parent | 4d444d04c1e19cd02ac836d411433906a9f32613 (diff) | |
| download | ffmpeg-2ca759657bcda328acc312e5882a940333a3e268.tar.gz | |
os_support: Remove the dynamic loading of getaddrinfo from the fallback getaddrinfo
If we for some unexplicable reason didn't pick up getaddrinfo
at configure, the default, IPv4-only, fallback should be good enough.
This effectively reverts 6023d84a2b7.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/os_support.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c index e9b1f88fb8..6a0c1fa7fc 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -74,16 +74,6 @@ int ff_getaddrinfo(const char *node, const char *service, struct addrinfo *ai; struct sockaddr_in *sin; -#if HAVE_WINSOCK2_H - int (WSAAPI *win_getaddrinfo)(const char *node, const char *service, - const struct addrinfo *hints, - struct addrinfo **res); - HMODULE ws2mod = GetModuleHandle("ws2_32.dll"); - win_getaddrinfo = GetProcAddress(ws2mod, "getaddrinfo"); - if (win_getaddrinfo) - return win_getaddrinfo(node, service, hints, res); -#endif /* HAVE_WINSOCK2_H */ - *res = NULL; sin = av_mallocz(sizeof(struct sockaddr_in)); if (!sin) @@ -147,17 +137,6 @@ int ff_getaddrinfo(const char *node, const char *service, void ff_freeaddrinfo(struct addrinfo *res) { -#if HAVE_WINSOCK2_H - void (WSAAPI *win_freeaddrinfo)(struct addrinfo *res); - HMODULE ws2mod = GetModuleHandle("ws2_32.dll"); - win_freeaddrinfo = (void (WSAAPI *)(struct addrinfo *res)) - GetProcAddress(ws2mod, "freeaddrinfo"); - if (win_freeaddrinfo) { - win_freeaddrinfo(res); - return; - } -#endif /* HAVE_WINSOCK2_H */ - av_free(res->ai_canonname); av_free(res->ai_addr); av_free(res); @@ -169,16 +148,6 @@ int ff_getnameinfo(const struct sockaddr *sa, int salen, { const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; -#if HAVE_WINSOCK2_H - int (WSAAPI *win_getnameinfo)(const struct sockaddr *sa, socklen_t salen, - char *host, DWORD hostlen, - char *serv, DWORD servlen, int flags); - HMODULE ws2mod = GetModuleHandle("ws2_32.dll"); - win_getnameinfo = GetProcAddress(ws2mod, "getnameinfo"); - if (win_getnameinfo) - return win_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags); -#endif /* HAVE_WINSOCK2_H */ - if (sa->sa_family != AF_INET) return EAI_FAMILY; if (!host && !serv) |