virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  avutil: Include io.h with a separate condition from MapViewOfFile
  cmdutils: Use a configure check for enabling CommandLineToArgvW

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-11-30 14:55:04 +01:00
parent db29a7c7c2 15816c8e8b
commit 034a1afbd8
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmdutils.c
View File

@@ -200,7 +200,7 @@ static const OptionDef *find_option(const OptionDef *po, const char *name)
return po; return po;
} }
#if defined(_WIN32) && !defined(__MINGW32CE__) #if HAVE_COMMANDLINETOARGVW
#include <windows.h> #include <windows.h>
#include <shellapi.h> #include <shellapi.h>
/* Will be leaked on exit */ /* Will be leaked on exit */
@@ -260,7 +260,7 @@ static inline void prepare_app_arguments(int *argc_ptr, char ***argv_ptr)
{ {
/* nothing to do */ /* nothing to do */
} }
#endif /* WIN32 && !__MINGW32CE__ */ #endif /* HAVE_COMMANDLINETOARGVW */
int parse_option(void *optctx, const char *opt, const char *arg, int parse_option(void *optctx, const char *opt, const char *arg,
const OptionDef *options) const OptionDef *options)

1
configure vendored
View File

@@ -1324,6 +1324,7 @@ HAVE_LIST="
clock_gettime clock_gettime
closesocket closesocket
cmov cmov
CommandLineToArgvW
cpunop cpunop
CryptGenRandom CryptGenRandom
dcbzl dcbzl

4
libavutil/file.c
View File

@@ -25,10 +25,12 @@
#if HAVE_UNISTD_H #if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#if HAVE_IO_H
#include <io.h>
#endif
#if HAVE_MMAP #if HAVE_MMAP
#include <sys/mman.h> #include <sys/mman.h>
#elif HAVE_MAPVIEWOFFILE #elif HAVE_MAPVIEWOFFILE
#include <io.h>
#include <windows.h> #include <windows.h>
#endif #endif