network: use getservbyport() only if available

The absence of this function will only give a less informative
string back from our fallback implementation of getnameinfo().

Signed-off-by: Mans Rullgard <mans@mansr.com>

diff --git a/configure b/configure
index 996c7169e4eb27cb1d85c15e1b9cc95a3dbedb31..e1524fbf21253f5be8cba52924cb848d00faa9fb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1190,6 +1190,7 @@ HAVE_LIST="
     GetProcessTimes
     GetSystemTimeAsFileTime
     getrusage
+    getservbyport
     gettimeofday
     gnu_as
     ibm_asm
@@ -3158,6 +3159,7 @@ if enabled network; then
     check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len
     check_type netinet/sctp.h "struct sctp_event_subscribe"
     check_func getaddrinfo $network_extralibs
+    check_func getservbyport $network_extralibs
     # Prefer arpa/inet.h over winsock2
     if check_header arpa/inet.h ; then
         check_func closesocket

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 76187082836a5abb0d07b11efbcd98aa00a7d7f7..451801ff706200be4143a6af37b04045cd8c6adf 100644 (file)
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -235,8 +235,10 @@ 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
 
         if (ent)
             snprintf(serv, servlen, "%s", ent->s_name);