[FFmpeg-cvslog] Merge commit '2ca759657bcda328acc312e5882a940333a3e268'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Nov  1 14:01:54 2017 -0300| [b5e2974b64e5b1192bc4f1c42f8cc294d076e33e] | committer: James Almer

Merge commit '2ca759657bcda328acc312e5882a940333a3e268'

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

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5e2974b64e5b1192bc4f1c42f8cc294d076e33e
---

 libavformat/os_support.c | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 86d0b8f306..47445854c6 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -75,16 +75,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)
@@ -148,17 +138,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_freep(&res->ai_canonname);
     av_freep(&res->ai_addr);
     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;
 
-#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)


======================================================================

diff --cc libavformat/os_support.c
index 86d0b8f306,6a0c1fa7fc..47445854c6
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@@ -148,20 -137,9 +138,9 @@@ int ff_getaddrinfo(const char *node, co
  
  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);
 +    av_freep(&res->ai_canonname);
 +    av_freep(&res->ai_addr);
 +    av_freep(&res);
  }
  
  int ff_getnameinfo(const struct sockaddr *sa, int salen,