Moves the display of metadata to dump_format()

[ffmpeg] / libavformat / os_support.c

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 23fc922e8444096d802fb23456d2d7f89e57f522..6763e39cf9bc0de85173efa2885101dfbe799ad4 100644 (file)
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -19,62 +19,46 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+/* needed by inet_aton() */
+#define _SVID_SOURCE
+
 #include "config.h"
 #include "avformat.h"
-#if !defined(__MINGW32__)
 #include <unistd.h>
 #include <fcntl.h>
-#endif
 #include <sys/time.h>
-#include <time.h>
+#include "os_support.h"
 
-#ifndef HAVE_SYS_POLL_H
-#if defined(__MINGW32__)
+#if CONFIG_NETWORK
+#if !HAVE_POLL_H
+#if HAVE_WINSOCK2_H
 #include <winsock2.h>
-#else
+#elif HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #endif
 
-/**
- * gets the current time in micro seconds.
- */
-int64_t av_gettime(void)
-{
-    struct timeval tv;
-    gettimeofday(&tv,NULL);
-    return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
-}
-
-#ifdef CONFIG_NETWORK
 #include "network.h"
 
-#if !defined(HAVE_INET_ATON)
+#if !HAVE_INET_ATON
 #include <stdlib.h>
 #include <strings.h>
 
 int inet_aton (const char * str, struct in_addr * add)
 {
-    const char * pch = str;
     unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0;
 
-    add1 = atoi(pch);
-    pch = strpbrk(pch,".");
-    if (pch == 0 || ++pch == 0) goto done;
-    add2 = atoi(pch);
-    pch = strpbrk(pch,".");
-    if (pch == 0 || ++pch == 0) goto done;
-    add3 = atoi(pch);
-    pch = strpbrk(pch,".");
-    if (pch == 0 || ++pch == 0) goto done;
-    add4 = atoi(pch);
-
-done:
+    if (sscanf(str, "%d.%d.%d.%d", &add1, &add2, &add3, &add4) != 4)
+        return 0;
+
+    if (!add1 || (add1|add2|add3|add4) > 255) return 0;
+
     add->s_addr=(add4<<24)+(add3<<16)+(add2<<8)+add1;
 
     return 1;
 }
-#endif /* !defined(HAVE_INET_ATON) */
+#endif /* !HAVE_INET_ATON */
 
 /* resolve host with also IP address parsing */
 int resolve_host(struct in_addr *sin_addr, const char *hostname)
@@ -85,14 +69,14 @@ int resolve_host(struct in_addr *sin_addr, const char *hostname)
         hp = gethostbyname(hostname);
         if (!hp)
             return -1;
-        memcpy(sin_addr, hp->h_addr, sizeof(struct in_addr));
+        memcpy(sin_addr, hp->h_addr_list[0], sizeof(struct in_addr));
     }
     return 0;
 }
 
 int ff_socket_nonblock(int socket, int enable)
 {
-#ifdef __MINGW32__
+#if HAVE_WINSOCK2_H
    return ioctlsocket(socket, FIONBIO, &enable);
 #else
    if (enable)
@@ -103,8 +87,8 @@ int ff_socket_nonblock(int socket, int enable)
 }
 #endif /* CONFIG_NETWORK */
 
-#ifdef CONFIG_FFSERVER
-#ifndef HAVE_SYS_POLL_H
+#if CONFIG_FFSERVER
+#if !HAVE_POLL_H
 int poll(struct pollfd *fds, nfds_t numfds, int timeout)
 {
     fd_set read_set;
@@ -114,7 +98,7 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
     int n;
     int rc;
 
-#ifdef __MINGW32__
+#if HAVE_WINSOCK2_H
     if (numfds >= FD_SETSIZE) {
         errno = EINVAL;
         return -1;
@@ -129,7 +113,7 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
     for(i = 0; i < numfds; i++) {
         if (fds[i].fd < 0)
             continue;
-#ifndef __MINGW32__
+#if !HAVE_WINSOCK2_H
         if (fds[i].fd >= FD_SETSIZE) {
             errno = EINVAL;
             return -1;
@@ -171,6 +155,6 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
 
     return rc;
 }
-#endif /* HAVE_SYS_POLL_H */
+#endif /* HAVE_POLL_H */
 #endif /* CONFIG_FFSERVER */