diff --git a/stepmania/src/PaneDisplay.cpp b/stepmania/src/PaneDisplay.cpp index b1d74be03c..49c8cae8a0 100644 --- a/stepmania/src/PaneDisplay.cpp +++ b/stepmania/src/PaneDisplay.cpp @@ -269,7 +269,7 @@ void PaneDisplay::SetContent( PaneContents c ) const CString metric = ITEM_COLOR(g_Contents[c].name, p); CStringArray spec; split( metric, ";", spec ); - LOG->Trace("%i/%i, '%s', %i, max '%s'", p, num, metric.c_str(), spec.size(), spec[0].c_str() ); + LOG->Trace("%i/%i, '%s', %zu, max '%s'", p, num, metric.c_str(), spec.size(), spec[0].c_str() ); if( spec.size() < 2 ) RageException::Throw( "Metric '%s' malformed", metric.c_str() ); const float n = (float) atof( spec[0] ); diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 9dfdc401e8..e2deb3904b 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -1042,7 +1042,7 @@ bool RageDisplay_OGL::IsZWriteEnabled() const bool RageDisplay_OGL::IsZTestEnabled() const { GLenum a; - glGetIntegerv( GL_DEPTH_FUNC, (int*)&a ); + glGetIntegerv( GL_DEPTH_FUNC, (GLint*)&a ); return a != GL_ALWAYS; } diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp index e0a5fe60e3..dd40298eab 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp @@ -278,7 +278,7 @@ int FFMpeg_Helper::DecodePacket() { if ( GetNextTimestamp ) { - if (pkt.pts != AV_NOPTS_VALUE) + if (pkt.pts != int(AV_NOPTS_VALUE)) pts = (float)pkt.pts * m_fctx->pts_num / m_fctx->pts_den; else pts = -1;