diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2012-02-28 00:28:13 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2012-02-28 00:28:13 -0600 |
| commit | ee09def802f9883056a2dc43136e65922dcccee2 (patch) | |
| tree | d504c21db411b5d67c046ae836e7583c23d4c2ce /Source/Core/VideoCommon | |
| parent | c3293b1a1cea3cdd9858b00c2a34d783347e72c3 (diff) | |
| parent | 38823b63716b46ec00337f20127de43661deac8b (diff) | |
Merge branch 'cpp11'
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/AVIDump.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/BPMemory.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 469e00d9f5..670693690b 100644 --- a/Source/Core/VideoCommon/Src/AVIDump.cpp +++ b/Source/Core/VideoCommon/Src/AVIDump.cpp @@ -263,7 +263,7 @@ bool AVIDump::CreateFile() s_Stream->codec->bit_rate = 400000; s_Stream->codec->width = s_width; s_Stream->codec->height = s_height; - s_Stream->codec->time_base = (AVRational){1, VideoInterface::TargetRefreshRate}; + s_Stream->codec->time_base = (AVRational){1, static_cast<int>(VideoInterface::TargetRefreshRate)}; s_Stream->codec->gop_size = 12; s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P; diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index da09893f35..5c4ed457e3 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -61,7 +61,7 @@ void BPReload() // Cases in which we DON'T want to reload the BP continue; default: - BPCmd bp = {i, 0xFFFFFF, ((u32*)&bpmem)[i]}; + BPCmd bp = {i, 0xFFFFFF, static_cast<int>(((u32*)&bpmem)[i])}; BPWritten(bp); } } |