RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 17:21:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '2ca759657bcda328acc312e5882a940333a3e268'

Browse Source 
* commit '2ca759657bcda328acc312e5882a940333a3e268':
  os_support: Remove the dynamic loading of getaddrinfo from the fallback getaddrinfo

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-01 14:01:54 -03:00
commit b5e2974b64
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavformat/os_support.c
View File

@ -75,16 +75,6 @@ int ff_getaddrinfo(const char *node, const char *service,
struct addrinfo *ai; struct addrinfo *ai;
struct sockaddr_in *sin; 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; *res = NULL;
sin = av_mallocz(sizeof(struct sockaddr_in)); sin = av_mallocz(sizeof(struct sockaddr_in));
if (!sin) if (!sin)
@ -148,17 +138,6 @@ int ff_getaddrinfo(const char *node, const char *service,
void ff_freeaddrinfo(struct addrinfo *res) 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_freep(&res->ai_canonname); av_freep(&res->ai_canonname);
av_freep(&res->ai_addr); av_freep(&res->ai_addr);
av_freep(&res); av_freep(&res);
@ -170,16 +149,6 @@ int ff_getnameinfo(const struct sockaddr *sa, int salen,
{ {
const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; 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) if (sa->sa_family != AF_INET)
return EAI_FAMILY; return EAI_FAMILY;
if (!host && !serv) if (!host && !serv)