virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

MinGW patch by <koyama AT infocity DOT co DOT jp>, reworked. Removed placeholder for winsock.

Browse Source 
Originally committed as revision 7990 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
François Revol 2007-02-15 13:32:06 +00:00
parent 5286d11fcd
commit 36c07acd59
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1572,6 +1572,8 @@ fi
enabled audio_beos && add_extralibs "-lmedia -lbe" enabled audio_beos && add_extralibs "-lmedia -lbe"
enabled mingw32 && add_extralibs -lws2_32
########################################## ##########################################
# imlib check # imlib check

5
libavformat/os_support.c
View File

@ -35,9 +35,14 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include <time.h> #include <time.h>
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_SYS_POLL_H
#if defined(__MINGW32__)
#include <winsock2.h>
#else
#include <sys/select.h> #include <sys/select.h>
#endif #endif
#endif
/** /**
* gets the current time in micro seconds. * gets the current time in micro seconds.

8
libavformat/os_support.h
View File

@ -32,7 +32,7 @@
* - floatf() (OS/2) * - floatf() (OS/2)
* - strcasecmp() (OS/2) * - strcasecmp() (OS/2)
* - closesocket() * - closesocket()
* - poll() (BeOS) * - poll() (BeOS, MinGW)
*/ */
#if defined(__BEOS__) || defined(__INNOTEK_LIBC__) #if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
@ -45,11 +45,7 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
# define usleep(t) Sleep((t) / 1000) # define usleep(t) Sleep((t) / 1000)
# include <fcntl.h> # include <fcntl.h>
# define lseek(f,p,w) _lseeki64((f), (p), (w)) # define lseek(f,p,w) _lseeki64((f), (p), (w))
#endif # define HAVE_CLOSESOCKET 1
/* XXX: check for Winsock here */
#if 0
#define HAVE_CLOSESOCKET 1
#endif #endif
#ifdef __BEOS__ #ifdef __BEOS__