Merge commit '00b62968d079e63bf22028f253ac297292436ebe'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 2 Nov 2015 10:43:50 +0000 (11:43 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 2 Nov 2015 10:43:50 +0000 (11:43 +0100)
* commit '00b62968d079e63bf22028f253ac297292436ebe':
  os_support: Don't try to return the service name as a string in getnameinfo

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
configure
libavformat/os_support.c

diff --cc configure
+++ b/configure
@@@ -1808,11 -1513,8 +1808,10 @@@ SYSTEM_FUNCS=
      GetProcessMemoryInfo
      GetProcessTimes
      getrusage
-     getservbyport
      GetSystemTimeAsFileTime
      gettimeofday
 +    glob
 +    glXGetProcAddress
      gmtime_r
      inet_aton
      isatty
@@@ -5099,14 -4237,8 +5098,13 @@@ elif check_func dlopen -ldl; the
      ldl=-ldl
  fi
  
 +frei0r_filter_extralibs='$ldl'
 +frei0r_src_filter_extralibs='$ldl'
 +ladspa_filter_extralibs='$ldl'
 +nvenc_encoder_extralibs='$ldl'
 +
  if ! disabled network; then
      check_func getaddrinfo $network_extralibs
-     check_func getservbyport $network_extralibs
      check_func inet_aton $network_extralibs
  
      check_type netdb.h "struct addrinfo"
Simple merge