diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 01:13:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-26 01:13:07 +0200 |
| commit | 3b0ad040b3bffaea5c5fd36bfddd9a436bc6c9c4 (patch) | |
| tree | 577f31caa05926e2a6ba6daf16397a9a2768f09d /libavutil/log.c | |
| parent | 9b72041f805ed71a88182449984e3975fc76ceca (diff) | |
| parent | 246154a9aff222b80befd65faf97494ce9113306 (diff) | |
| download | ffmpeg-3b0ad040b3bffaea5c5fd36bfddd9a436bc6c9c4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
log: Include io.h on windows
lavr: x86: merge some branches
x86: cpu: whitespace (mostly) cosmetics
x86: fft: win64: fix stack alignment for memcpy() call
Conflicts:
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/log.c')
| -rw-r--r-- | libavutil/log.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/log.c b/libavutil/log.c index 155276c769..a641682b97 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -40,6 +40,7 @@ static int flags; #if defined(_WIN32) && !defined(__MINGW32CE__) #include <windows.h> +#include <io.h> static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = { [AV_LOG_PANIC /8] = 12, [AV_LOG_FATAL /8] = 12, |