ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Buildfix.

This commit is contained in:
Jordan Woyak 2013-02-26 19:59:33 -06:00
parent f1c990069c
commit a680d17eef
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoCommon/Src/AVIDump.cpp
View File

@ -159,13 +159,13 @@ void AVIDump::Stop()
void AVIDump::AddFrame(const u8* data, int w, int h) void AVIDump::AddFrame(const u8* data, int w, int h)
{ {
static bool bShownError = false; static bool shown_error = false;
if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !bShownError) if ((w != m_bitmap.biWidth || h != m_bitmap.biHeight) && !shown_error)
{ {
PanicAlert("You have resized the window while dumping frames.\n" PanicAlert("You have resized the window while dumping frames.\n"
"Nothing sane can be done to handle this.\n" "Nothing sane can be done to handle this.\n"
"Your video will likely be broken."); "Your video will likely be broken.");
bShownError=true; shown_error = true;
m_bitmap.biWidth = w; m_bitmap.biWidth = w;
m_bitmap.biHeight = h; m_bitmap.biHeight = h;
@ -312,7 +312,7 @@ bool AVIDump::CreateFile()
void AVIDump::AddFrame(const u8* data, int width, int height) 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 // Convert image from BGR24 to desired pixel format, and scale to initial
// width and height // width and height

2
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -1218,7 +1218,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
OSD::AddMessage("Error opening framedump.raw for writing.", 2000); OSD::AddMessage("Error opening framedump.raw for writing.", 2000);
else else
{ {
OSD::AddMessage(StromFromFormat("Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h), 2000); OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d RGB24)", movie_file_name.c_str(), w, h).c_str(), 2000);
} }
} }
if (pFrameDump) if (pFrameDump)