1 files changed, 0 insertions, 155 deletions
diff --git a/contrib/ffmpeg/libavformat/os_support.c b/contrib/ffmpeg/libavformat/os_support.c
deleted file mode 100644
index cc109d596..000000000
--- a/contrib/ffmpeg/libavformat/os_support.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Various utilities for ffmpeg system
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
- * copyright (c) 2002 Francois Revol
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#include "config.h"
-#include "avformat.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include "os_support.h"
-
-#ifdef CONFIG_NETWORK
-#ifndef HAVE_POLL_H
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
-#elif defined (HAVE_SYS_SELECT_H)
-#include <sys/select.h>
-#endif
-#endif
-
-#include "network.h"
-
-#if !defined(HAVE_INET_ATON)
-#include <stdlib.h>
-#include <strings.h>
-
-int inet_aton (const char * str, struct in_addr * add)
-{
-    unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0;
-
-    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) */
-
-/* resolve host with also IP address parsing */
-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));
-    }
-    return 0;
-}
-
-int ff_socket_nonblock(int socket, int enable)
-{
-#ifdef HAVE_WINSOCK2_H
-   return ioctlsocket(socket, FIONBIO, &enable);
-#else
-   if (enable)
-      return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK);
-   else
-      return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) & ~O_NONBLOCK);
-#endif
-}
-#endif /* CONFIG_NETWORK */
-
-#ifdef CONFIG_FFSERVER
-#ifndef HAVE_POLL_H
-int poll(struct pollfd *fds, nfds_t numfds, int timeout)
-{
-    fd_set read_set;
-    fd_set write_set;
-    fd_set exception_set;
-    nfds_t i;
-    int n;
-    int rc;
-
-#ifdef HAVE_WINSOCK2_H
-    if (numfds >= FD_SETSIZE) {
-        errno = EINVAL;
-        return -1;
-    }
-#endif
-
-    FD_ZERO(&read_set);
-    FD_ZERO(&write_set);
-    FD_ZERO(&exception_set);
-
-    n = -1;
-    for(i = 0; i < numfds; i++) {
-        if (fds[i].fd < 0)
-            continue;
-#ifndef HAVE_WINSOCK2_H
-        if (fds[i].fd >= FD_SETSIZE) {
-            errno = EINVAL;
-            return -1;
-        }
-#endif
-
-        if (fds[i].events & POLLIN)  FD_SET(fds[i].fd, &read_set);
-        if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set);
-        if (fds[i].events & POLLERR) FD_SET(fds[i].fd, &exception_set);
-
-        if (fds[i].fd > n)
-            n = fds[i].fd;
-    };
-
-    if (n == -1)
-        /* Hey!? Nothing to poll, in fact!!! */
-        return 0;
-
-    if (timeout < 0)
-        rc = select(n+1, &read_set, &write_set, &exception_set, NULL);
-    else {
-        struct timeval    tv;
-
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = 1000 * (timeout % 1000);
-        rc = select(n+1, &read_set, &write_set, &exception_set, &tv);
-    };
-
-    if (rc < 0)
-        return rc;
-
-    for(i = 0; i < (nfds_t) n; i++) {
-        fds[i].revents = 0;
-
-        if (FD_ISSET(fds[i].fd, &read_set))      fds[i].revents |= POLLIN;
-        if (FD_ISSET(fds[i].fd, &write_set))     fds[i].revents |= POLLOUT;
-        if (FD_ISSET(fds[i].fd, &exception_set)) fds[i].revents |= POLLERR;
-    };
-
-    return rc;
-}
-#endif /* HAVE_POLL_H */
-#endif /* CONFIG_FFSERVER */
-