diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-08-19 17:40:04 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-08-19 17:40:04 -0400 |
| commit | 5b86e7335f7eff95b5454cdb4d053014d6e4bca2 (patch) | |
| tree | 79772cfc6fcbe0e65ead323cd103d7ff9ebb78fd /Source/Core | |
| parent | b0c9d73465a162b0f7e56a3dedaec8722e9a6a57 (diff) | |
| parent | 09714f86c3e4605385151af81bcde051686d8ccf (diff) | |
Merge pull request #2795 from ddcc/master
Fix some compilation warnings
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/AVIDump.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 57ac68fd90..f0125f7fa2 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1472,7 +1472,7 @@ void CFrame::ParseHotkeys() VertexShaderManager::ResetView(); // Savestates - for (unsigned int i = 0; i < State::NUM_STATES; i++) + for (u32 i = 0; i < State::NUM_STATES; i++) { if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i)) State::Load(1 + i); diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index fe5b0050e7..d3f2581920 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -480,12 +480,12 @@ void AVIDump::AddFrame(const u8* data, int width, int height) while (!error && got_packet) { // Write the compressed frame in the media file. - if (pkt.pts != AV_NOPTS_VALUE) + if (static_cast<u64>(pkt.pts) != AV_NOPTS_VALUE) { pkt.pts = av_rescale_q(pkt.pts, s_stream->codec->time_base, s_stream->time_base); } - if (pkt.dts != AV_NOPTS_VALUE) + if (static_cast<u64>(pkt.dts) != AV_NOPTS_VALUE) { pkt.dts = av_rescale_q(pkt.dts, s_stream->codec->time_base, s_stream->time_base); |