Browse Source

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
tags/v0.5
François Revol 18 years ago
parent
commit
36c07acd59
3 changed files with 9 additions and 6 deletions
  1. +2
    -0
      configure
  2. +5
    -0
      libavformat/os_support.c
  3. +2
    -6
      libavformat/os_support.h

+ 2
- 0
configure View File

@@ -1572,6 +1572,8 @@ fi

enabled audio_beos && add_extralibs "-lmedia -lbe"

enabled mingw32 && add_extralibs -lws2_32

##########################################
# imlib check



+ 5
- 0
libavformat/os_support.c View File

@@ -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.


+ 2
- 6
libavformat/os_support.h View File

@@ -32,7 +32,7 @@
* - floatf() (OS/2)
* - strcasecmp() (OS/2)
* - closesocket()
* - poll() (BeOS)
* - poll() (BeOS, MinGW)
*/

#if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
@@ -45,11 +45,7 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
# define usleep(t) Sleep((t) / 1000)
# include <fcntl.h>
# define lseek(f,p,w) _lseeki64((f), (p), (w))
#endif

/* XXX: check for Winsock here */
#if 0
#define HAVE_CLOSESOCKET 1
# define HAVE_CLOSESOCKET 1
#endif

#ifdef __BEOS__


Loading…
Cancel
Save