Merge commit '3efd71b4d0b4a73ccbbbdc092e6bbd54d92633f4'

[ffmpeg] / libavformat / os_support.c

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 7950e44889130f1498ce7bf0b74f28ed902ca562..86d0b8f306d2343b7bdf8940ac280583f83293fa 100644 (file)
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -205,16 +205,9 @@ int ff_getnameinfo(const struct sockaddr *sa, int salen,
     }
 
     if (serv && servlen > 0) {
-        struct servent *ent = NULL;
-#if HAVE_GETSERVBYPORT
         if (!(flags & NI_NUMERICSERV))
-            ent = getservbyport(sin->sin_port, flags & NI_DGRAM ? "udp" : "tcp");
-#endif /* HAVE_GETSERVBYPORT */
-
-        if (ent)
-            snprintf(serv, servlen, "%s", ent->s_name);
-        else
-            snprintf(serv, servlen, "%d", ntohs(sin->sin_port));
+            return EAI_FAIL;
+        snprintf(serv, servlen, "%d", ntohs(sin->sin_port));
     }
 
     return 0;