From 2378b443c109f2052c5608ddcbef9dc5d581bd70 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 14 Nov 2010 22:07:52 +0000 Subject: [PATCH] Build fix for windows. Also a correction to the frame rate for the mpg encoding. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6416 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/AVIDump.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp index 3c5eb4d057..1fd7d57304 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -249,7 +249,7 @@ bool AVIDump::CreateFile() s_CodecContext->bit_rate = 400000; s_CodecContext->width = s_width; s_CodecContext->height = s_height; - s_CodecContext->time_base = (AVRational){1, 60}; + s_CodecContext->time_base = (AVRational){1, 30}; s_CodecContext->gop_size = 10; s_CodecContext->max_b_frames = 1; s_CodecContext->pix_fmt = PIX_FMT_YUV420P; diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index bc9352fe79..e4015bb837 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1333,7 +1333,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons s_criticalScreenshot.Enter(); int w = dst_rect.GetWidth(); int h = dst_rect.GetHeight(); - uint8_t *data = new uint8_t[3 * w * h]; + u8 *data = new u8[3 * w * h]; glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data); if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0)