aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/os_support.c
diff options
context:
space:
mode:
authorFrançois Revol <revol@free.fr>2007-02-15 13:32:06 +0000
committerFrançois Revol <revol@free.fr>2007-02-15 13:32:06 +0000
commit36c07acd595288c2747d491993d044b81593b00c (patch)
tree7a458ab09b459fe6b7e89c90a745ef3155ff8699 /libavformat/os_support.c
parent5286d11fcd177f274ae69905eb8f43164ee5d0ec (diff)
downloadffmpeg-36c07acd595288c2747d491993d044b81593b00c.tar.gz
MinGW patch by <koyama AT infocity DOT co DOT jp>, reworked. Removed placeholder for winsock.
Originally committed as revision 7990 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/os_support.c')
-rw-r--r--libavformat/os_support.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index 8372af2921..5427c567e6 100644
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -35,9 +35,14 @@
#include <sys/time.h>
#endif
#include <time.h>
+
#ifndef HAVE_SYS_POLL_H
+#if defined(__MINGW32__)
+#include <winsock2.h>
+#else
#include <sys/select.h>
#endif
+#endif
/**
* gets the current time in micro seconds.