diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-26 19:59:33 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-26 19:59:33 -0600 |
| commit | a680d17eef88646b8cd6018c1c5e8f0e39d056ee (patch) | |
| tree | 5e7a2f620c5baf0ab8aa52b79d458daa87bf2f47 /Source/Core/VideoCommon | |
| parent | f1c990069c8d0e54f7aa079e6e2c7b785a0d56db (diff) | |
Buildfix.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/AVIDump.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index 8514e8bd03..fefb09fecb 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -159,13 +159,13 @@ void AVIDump::Stop() void AVIDump::AddFrame(const u8* data, int w, int h) { - static bool bShownError = false; - if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !bShownError) + static bool shown_error = false; + if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !shown_error) { PanicAlert("You have resized the window while dumping frames.\n" "Nothing sane can be done to handle this.\n" "Your video will likely be broken."); - bShownError=true; + shown_error = true; m_bitmap.biWidth = w; m_bitmap.biHeight = h; @@ -312,7 +312,7 @@ bool AVIDump::CreateFile() void AVIDump::AddFrame(const u8* data, int width, int height) { - avpicture_fill((AVPicture *)s_BGRFrame, data, PIX_FMT_BGR24, width, height); + avpicture_fill((AVPicture *)s_BGRFrame, const_cast<u8*>(data), PIX_FMT_BGR24, width, height); // Convert image from BGR24 to desired pixel format, and scale to initial // width and height |