Buildfix.

dolphin-emu · Feb 27, 2013 · a680d17 · a680d17
1 parent f1c9900
commit a680d17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -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);
 				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)