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 commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'

Browse Source 
* commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520':
  libavutil: Don't use fcntl if the function does not exist
  cmdutils: Only do the windows-specific commandline parsing on _WIN32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-08 11:54:10 +02:00
parent 756f865e3b 0f1fb6c019
commit f09b5fb4af
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmdutils.c
View File

@@ -213,7 +213,10 @@ static const OptionDef *find_option(const OptionDef *po, const char *name)
return po; return po;
} }
#if HAVE_COMMANDLINETOARGVW /* _WIN32 means using the windows libc - cygwin doesn't define that
* by default. HAVE_COMMANDLINETOARGVW is true on cygwin, while
* it doesn't provide the actual command line via GetCommandLineW(). */
#if HAVE_COMMANDLINETOARGVW && defined(_WIN32)
#include <windows.h> #include <windows.h>
#include <shellapi.h> #include <shellapi.h>
/* Will be leaked on exit */ /* Will be leaked on exit */