RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '00b62968d079e63bf22028f253ac297292436ebe'

Browse Source 
* 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>
This commit is contained in:
Hendrik Leppkes 2015-11-02 11:43:50 +01:00
commit 6b5d6c93dd
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1808,7 +1808,6 @@ SYSTEM_FUNCS="
GetProcessMemoryInfo
GetProcessTimes
getrusage
getservbyport
GetSystemTimeAsFileTime
gettimeofday
glob
@ -5106,7 +5105,6 @@ 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"

11
libavformat/os_support.c
View File

@ -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;