diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2017-11-15 19:15:23 +0100 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2017-11-17 23:34:18 +0100 |
| commit | 15b019e40adb1fdc25f7ba1aca8f473619d07ae7 (patch) | |
| tree | 256c0e1ee8ce71de97812dc5c86a38426acdbb6e /compat | |
| parent | 6fb617077621236a34c2a1b6ae9e2ffc2ccd8902 (diff) | |
| download | ffmpeg-15b019e40adb1fdc25f7ba1aca8f473619d07ae7.tar.gz | |
avcodec/nvenc: fix double defined GUID on cygwin
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/nvenc/nvEncodeAPI.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/nvenc/nvEncodeAPI.h b/compat/nvenc/nvEncodeAPI.h index c3a8294212..e662880f4d 100644 --- a/compat/nvenc/nvEncodeAPI.h +++ b/compat/nvenc/nvEncodeAPI.h @@ -77,7 +77,7 @@ extern "C" { typedef RECT NVENC_RECT; #else // ========================================================================================= -#ifndef GUID +#if !defined(GUID) && !defined(GUID_DEFINED) /*! * \struct GUID * Abstracts the GUID structure for non-windows platforms. |