diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:55:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:55:12 +0100 |
| commit | 034a1afbd85ee18c1b7f3b9be59371173d421c6b (patch) | |
| tree | 7095b4cf27ffb4e43d00bf9e56d4c0c91216f3f7 /libavutil | |
| parent | db29a7c7c2822a2f2e9804988e279a9fe7d88c11 (diff) | |
| parent | 15816c8e8bd5ab2f027824ea5122d7901633634a (diff) | |
| download | ffmpeg-034a1afbd85ee18c1b7f3b9be59371173d421c6b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/file.c b/libavutil/file.c index 5aa4b9c0d1..41850f835b 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -25,10 +25,12 @@ #if HAVE_UNISTD_H #include <unistd.h> #endif +#if HAVE_IO_H +#include <io.h> +#endif #if HAVE_MMAP #include <sys/mman.h> #elif HAVE_MAPVIEWOFFILE -#include <io.h> #include <windows.h> #endif |