[Ffmpeg-cvslog] r8838 - in trunk: ffinstall.nsi ffserver.c libavformat/os_support.c
diego
subversion
Thu Apr 26 21:27:32 CEST 2007
Author: diego
Date: Thu Apr 26 21:27:32 2007
New Revision: 8838
Log:
cosmetics: Remove trailing whitespace and tabs.
Modified:
trunk/ffinstall.nsi
trunk/ffserver.c
trunk/libavformat/os_support.c
Modified: trunk/ffinstall.nsi
==============================================================================
--- trunk/ffinstall.nsi (original)
+++ trunk/ffinstall.nsi Thu Apr 26 21:27:32 2007
@@ -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"
Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c (original)
+++ trunk/ffserver.c Thu Apr 26 21:27:32 2007
@@ -4281,7 +4281,7 @@ static int parse_ffconfig(const char *fi
}
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);
Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c (original)
+++ trunk/libavformat/os_support.c Thu Apr 26 21:27:32 2007
@@ -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;
}
More information about the ffmpeg-cvslog
mailing list