remove obsolete requirements, quicktime 6 is from 2002, not sure if muxing scheme...

[ffmpeg] / libavformat / os_support.h

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 9c0965c5c1b53eb6059bfec8e5a1a01b4099d98d..34970e39520c8707ef322dac085b4bb7f7a07969 100644 (file)
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -25,21 +25,11 @@
 /**
  * @file os_support.h
  * miscellaneous OS support macros and functions.
- *
- * - socklen_t typedef (BeOS, Innotek libc)
- * - usleep() (Win32, BeOS)
- * - lseek() (Win32)
- * - closesocket()
- * - poll() (BeOS, MinGW)
  */
 
-#if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
-typedef int socklen_t;
-#endif
-
 #ifdef __MINGW32__
-__declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
-// #  include <windows.h>
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
 #  define usleep(t)    Sleep((t) / 1000)
 #  include <fcntl.h>
 #  define lseek(f,p,w) _lseeki64((f), (p), (w))
@@ -62,19 +52,24 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
 #  endif
 #endif
 
+#ifdef CONFIG_NETWORK
+#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
 /* most of the time closing a socket is just closing an fd */
 #ifndef HAVE_CLOSESOCKET
 #define closesocket close
 #endif
 
 #ifdef CONFIG_FFSERVER
-#ifndef HAVE_SYS_POLL_H
+#ifndef HAVE_POLL_H
 typedef unsigned long nfds_t;
 
 struct pollfd {
     int fd;
     short events;  /* events to look for */
-    short revents; /* events that occured */
+    short revents; /* events that occurred */
 };
 
 /* events & revents */
@@ -93,7 +88,8 @@ struct pollfd {
 
 
 extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
-#endif /* HAVE_SYS_POLL_H */
+#endif /* HAVE_POLL_H */
 #endif /* CONFIG_FFSERVER */
+#endif /* CONFIG_NETWORK */
 
 #endif /* FFMPEG_OS_SUPPORT_H */