Skip to content
Permalink
Browse files

Merge pull request #2795 from ddcc/master

Fix some compilation warnings
  • Loading branch information...
lioncash committed Aug 19, 2015
2 parents b0c9d73 + 09714f8 commit 5b86e7335f7eff95b5454cdb4d053014d6e4bca2
Showing with 3 additions and 3 deletions.
  1. +1 −1 Source/Core/DolphinWX/Frame.cpp
  2. +2 −2 Source/Core/VideoCommon/AVIDump.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);
@@ -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);

0 comments on commit 5b86e73

Please sign in to comment.
You can’t perform that action at this time.