diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2011-08-11 00:08:23 +0400 |
|---|---|---|
| committer | Underground78 <underground78@users.sourceforge.net> | 2011-08-11 00:08:23 +0400 |
| commit | 8caf4b5aaf91b5ffabc65d2ac2f000d8603ba233 (patch) | |
| tree | 9abcc8e8d78463d09ff1b69ec0443c71361a55e1 /src/filters/renderer/VideoRenderers | |
| parent | 3f21c3923cc0793b068cf74094225dabbd5c7dbb (diff) | |
Fix ~130 C4018 warnings (signed/unsigned mismatch).
Patch partially by XhmikosR.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3637 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/renderer/VideoRenderers')
| -rw-r--r-- | src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp | 2 | ||||
| -rw-r--r-- | src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp index 5d464f772..1f126b4bc 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp @@ -428,7 +428,7 @@ bool CEVRAllocatorPresenter::GetState( DWORD dwMilliSecsTimeout, FILTER_STATE *S CAutoLock lock(&m_SampleQueueLock);
if (m_bSignaledStarvation) {
- int nSamples = max(m_nNbDXSurface / 2, 1);
+ size_t nSamples = max(m_nNbDXSurface / 2, 1);
if ((m_ScheduledSamples.GetCount() < nSamples || m_LastSampleOffset < -m_rtTimePerFrame*2) && !g_bNoDuration) {
*State = (FILTER_STATE)Paused;
_ReturnValue = VFW_S_STATE_INTERMEDIATE;
diff --git a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp index 39e3e632f..3345fab6c 100644 --- a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp @@ -188,7 +188,7 @@ STDMETHODIMP CVMR9AllocatorPresenter::InitializeDevice(DWORD_PTR dwUserID, VMR9A // The surfaces should already be free when InitializeDevice is called
DeleteSurfaces();
- int nOriginal = *lpNumBuffers;
+ DWORD nOriginal = *lpNumBuffers;
if (*lpNumBuffers == 1) {
*lpNumBuffers = 4;
|