1 files changed, 59 insertions, 1 deletions

diff --git a/contrib/ffmpeg/libavformat/os_support.h b/contrib/ffmpeg/libavformat/os_support.h
index e76a9aaaf..424d6dabd 100644
--- a/contrib/ffmpeg/libavformat/os_support.h
+++ b/contrib/ffmpeg/libavformat/os_support.h
@@ -26,22 +26,46 @@
  * @file os_support.h
  * miscellaneous OS support macros and functions.
  *
+ * - socklen_t typedef (BeOS, Innotek libc)
  * - usleep() (Win32, BeOS, OS/2)
+ * - lseek() (Win32)
  * - floatf() (OS/2)
  * - strcasecmp() (OS/2)
+ * - 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 usleep(t)    Sleep((t) / 1000)
+#  include <fcntl.h>
+#  define lseek(f,p,w) _lseeki64((f), (p), (w))
+#  define HAVE_CLOSESOCKET 1
 #endif
 
 #ifdef __BEOS__
-#  ifndef usleep
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+   /* not net_server ? */
+#  if IPPROTO_TCP != 6
+#    define HAVE_CLOSESOCKET 1
+#  endif
+#  include <BeBuild.h>
+   /* R5 didn't have usleep, fake it. Haiku and Zeta has it now. */
+#  if B_BEOS_VERSION <= B_BEOS_VERSION_5
 #    include <OS.h>
+     /* doesn't set errno but that's enough */
 #    define usleep(t)  snooze((bigtime_t)(t))
 #  endif
+#  ifndef SA_RESTART
+#    warning SA_RESTART not implemented; ffserver might misbehave.
+#    define SA_RESTART 0
+#  endif
 #endif
 
 #if defined(CONFIG_OS2)
@@ -50,4 +74,38 @@ static inline int usleep(unsigned int t) { return _sleep2(t / 1000); }
 static inline int strcasecmp(const char* s1, const char* s2) { return stricmp(s1,s2); }
 #endif
 
+/* most of the time closing a socket is just closing an fd */
+#if HAVE_CLOSESOCKET != 1
+#define closesocket close
+#endif
+
+#ifdef CONFIG_FFSERVER
+#ifndef HAVE_SYS_POLL_H
+typedef unsigned long nfds_t;
+
+struct pollfd {
+    int fd;
+    short events;  /* events to look for */
+    short revents; /* events that occured */
+};
+
+/* events & revents */
+#define POLLIN     0x0001  /* any readable data available */
+#define POLLOUT    0x0002  /* file descriptor is writeable */
+#define POLLRDNORM POLLIN
+#define POLLWRNORM POLLOUT
+#define POLLRDBAND 0x0008  /* priority readable data */
+#define POLLWRBAND 0x0010  /* priority data can be written */
+#define POLLPRI    0x0020  /* high priority readable data */
+
+/* revents only */
+#define POLLERR    0x0004  /* errors pending */
+#define POLLHUP    0x0080  /* disconnected */
+#define POLLNVAL   0x1000  /* invalid file descriptor */
+
+
+extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
+#endif /* HAVE_SYS_POLL_H */
+#endif /* CONFIG_FFSERVER */
+
 #endif /* _OS_SUPPORT_H */