diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-10-02 19:51:25 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-10-02 19:51:25 +0400 |
| commit | ca54ea078ea6b9d7e860ffa48f35313a61735474 (patch) | |
| tree | 05b865c3ee27e7f0120b91f697fa4617602e7059 /source/gameengine/VideoTexture/VideoFFmpeg.h | |
| parent | 9ac8a1368f2741caf7bdc57b7142c0bc617c42bc (diff) | |
* due to the setup of headers in mingw 4.4.0, includes could mess up. Making sure that windows.h isn't included where it shouln't (outside of __cplusplus)
Diffstat (limited to 'source/gameengine/VideoTexture/VideoFFmpeg.h')
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index fbd04e7e1fc..b56984588c1 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -24,6 +24,7 @@ http://www.gnu.org/copyleft/lesser.txt. #ifdef WITH_FFMPEG extern "C" { +#undef __cplusplus #include <pthread.h> #include <libavformat/avformat.h> #include <libavcodec/avcodec.h> @@ -32,6 +33,7 @@ extern "C" { #include "DNA_listBase.h" #include "BLI_threads.h" #include "BLI_blenlib.h" +#define __cplusplus } |