aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2013-08-07 10:39:00 -0700
committerMartijn Kaijser <machine.sanctum@gmail.com>2013-08-07 10:39:00 -0700
commit62aafb9bb4c83fe102ab43ab12bb8c7835d63026 (patch)
treefafe244ab726787349dff45890e7d213ffc1efb1
parent60d1fd5587487fe41e910f7d557d490e7a6f79ea (diff)
parent6c4593078b11043539d1ed9cf853b2eb378f6e4f (diff)
Merge pull request #3067 from popcornmix/fix_compile_max
[rbp/omxplayer] Fix build error in types for max
-rw-r--r--xbmc/cores/omxplayer/OMXAudio.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
index 7759077130..6448ad8186 100644
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
@@ -473,7 +473,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device, OMXClock *
return false;
}
- port_param.nBufferCountActual = std::max(port_param.nBufferCountMin, m_BufferLen / port_param.nBufferSize);
+ port_param.nBufferCountActual = std::max((unsigned int)port_param.nBufferCountMin, m_BufferLen / port_param.nBufferSize);
omx_err = m_omx_decoder.SetParameter(OMX_IndexParamPortDefinition, &port_param);
if(omx_err != OMX_ErrorNone)