diff --git a/plugins/zzogl-pg/opengl/Util.h b/plugins/zzogl-pg/opengl/Util.h index 99141b65d3..40f3485835 100644 --- a/plugins/zzogl-pg/opengl/Util.h +++ b/plugins/zzogl-pg/opengl/Util.h @@ -22,7 +22,7 @@ #ifdef _WIN32 - +#include "Utilities/RedtapeWindows.h" #include #include #include diff --git a/plugins/zzogl-pg/opengl/Win32/aviUtil.h b/plugins/zzogl-pg/opengl/Win32/aviUtil.h index 7f7f66f06f..46049b7840 100644 --- a/plugins/zzogl-pg/opengl/Win32/aviUtil.h +++ b/plugins/zzogl-pg/opengl/Win32/aviUtil.h @@ -351,7 +351,7 @@ BOOL AVI_Exit() static PAVIFILE pfile = NULL; static PAVISTREAM ps = NULL; static PAVISTREAM psCompressed = NULL; -static int count = 0; +static int avi_count = 0; // Initialization... @@ -374,7 +374,7 @@ bool START_AVI(const char* file_name) bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int width, int height, int bits, void* pdata) { - if(count == 0) + if(avi_count == 0) { if(! AVI_CreateStream(pfile, &ps, _frameRate, width*height/bits, @@ -401,7 +401,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt } HRESULT hr = AVIStreamWrite(psCompressed, // stream pointer - count, // time of this frame + avi_count, // time of this frame 1, // number to write pdata, width*height/8, // lpbi->biSizeImage, // size of this frame @@ -416,7 +416,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt return FALSE; } - count++; + avi_count++; return true; } @@ -425,7 +425,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRate) { LPBITMAPINFOHEADER lpbi; - if(count == 0) + if(avi_count == 0) { lpbi = (LPBITMAPINFOHEADER)GlobalLock(dib); if(! AVI_CreateStream(pfile, &ps, _frameRate, @@ -449,7 +449,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRa } lpbi = (LPBITMAPINFOHEADER)GlobalLock(dib); - if(! AVI_AddFrame(psCompressed, count * 1, lpbi)) + if(! AVI_AddFrame(psCompressed, avi_count * 1, lpbi)) { //printf("Error - AVI_AddFrame()\n"); GlobalUnlock(lpbi); @@ -457,7 +457,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRa } GlobalUnlock(lpbi); - count++; + avi_count++; return true; }