ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2795 from ddcc/master 

Fix some compilation warnings
This commit is contained in:
Lioncash 2015-08-19 17:40:04 -04:00
parent b0c9d73465 09714f86c3
commit 5b86e7335f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Frame.cpp
View File

@ -1472,7 +1472,7 @@ void CFrame::ParseHotkeys()
VertexShaderManager::ResetView(); VertexShaderManager::ResetView();
// Savestates // 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)) if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i))
State::Load(1 + i); State::Load(1 + i);

4
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -480,12 +480,12 @@ void AVIDump::AddFrame(const u8* data, int width, int height)
while (!error && got_packet) while (!error && got_packet)
{ {
// Write the compressed frame in the media file. // 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, pkt.pts = av_rescale_q(pkt.pts,
s_stream->codec->time_base, s_stream->time_base); 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, pkt.dts = av_rescale_q(pkt.dts,
s_stream->codec->time_base, s_stream->time_base); s_stream->codec->time_base, s_stream->time_base);