Some warnings fixed (uninitialized local variable, unused local variable, comparison signed/unsigned type, assignment in if)

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1886 10f7b99b-c216-0410-bff0-8a66a9350fd8

2 files changed, 6 insertions, 4 deletions

diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
index 93e91fcd5..ac9f2a811 100644
--- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
+++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
@@ -39,10 +39,12 @@ CBaseVideoFilter::CBaseVideoFilter(TCHAR* pName, LPUNKNOWN lpunk, HRESULT* phr,
 {

 	if(phr) *phr = S_OK;

 

-	if(!(m_pInput = DNew CBaseVideoInputPin(NAME("CBaseVideoInputPin"), this, phr, L"Video"))) *phr = E_OUTOFMEMORY;

+	m_pInput = DNew CBaseVideoInputPin(NAME("CBaseVideoInputPin"), this, phr, L"Video");

+	if(!m_pInput) *phr = E_OUTOFMEMORY;

 	if(FAILED(*phr)) return;

 

-	if(!(m_pOutput = DNew CBaseVideoOutputPin(NAME("CBaseVideoOutputPin"), this, phr, L"Output"))) *phr = E_OUTOFMEMORY;

+	m_pOutput = DNew CBaseVideoOutputPin(NAME("CBaseVideoOutputPin"), this, phr, L"Output");

+	if(!m_pOutput) *phr = E_OUTOFMEMORY;

 	if(FAILED(*phr))  {delete m_pInput, m_pInput = NULL; return;}

 

 	m_wout = m_win = m_w = 0;

diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h
index 298cc615b..9324978bc 100644
--- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h
+++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h
@@ -36,8 +36,8 @@ private:
     HRESULT Receive(IMediaSample* pIn);

 

 	// these are private for a reason, don't bother them

-	DWORD m_win, m_hin, m_arxin, m_aryin;

-	DWORD m_wout, m_hout, m_arxout, m_aryout;

+	int m_win, m_hin, m_arxin, m_aryin;

+	int m_wout, m_hout, m_arxout, m_aryout;

 

 	long m_cBuffers;