diff options
| -rw-r--r-- | ffinstall.nsi | 4 | ||||
| -rw-r--r-- | ffserver.c | 2 | ||||
| -rw-r--r-- | libavformat/os_support.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ffinstall.nsi b/ffinstall.nsi index f483b0174f..d3198a04eb 100644 --- a/ffinstall.nsi +++ b/ffinstall.nsi @@ -32,7 +32,7 @@ Section "Install" File ".\ffplay.exe" File ".\COPYING" File ".\CREDITS" - + ; documentation SetOutPath $INSTDIR\doc File ".\doc\faq.html" @@ -58,7 +58,7 @@ Section Uninstall Delete "$INSTDIR\ffplay.exe" Delete "$INSTDIR\COPYING" Delete "$INSTDIR\CREDITS" - + ; delete documentation Delete "$INSTDIR\doc\faq.html" Delete "$INSTDIR\ffmpeg-doc.html" diff --git a/ffserver.c b/ffserver.c index 1c3a91e7e9..c34e47a93c 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4281,7 +4281,7 @@ static int parse_ffconfig(const char *filename) } get_arg(arg, sizeof(arg), &p); - + if (resolve_host(&acl.first, arg) != 0) { fprintf(stderr, "%s:%d: ACL refers to invalid host or ip address '%s'\n", filename, line_num, arg); diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 9dddab2f15..da303be49c 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -105,12 +105,12 @@ done: int resolve_host(struct in_addr *sin_addr, const char *hostname) { struct hostent *hp; - + if (!inet_aton(hostname, sin_addr)) { - hp = gethostbyname(hostname); - if (!hp) - return -1; - memcpy(sin_addr, hp->h_addr, sizeof(struct in_addr)); + hp = gethostbyname(hostname); + if (!hp) + return -1; + memcpy(sin_addr, hp->h_addr, sizeof(struct in_addr)); } return 0; } |