A lot of compiler L4 warnings fixed (some warnings disabled)

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

3 files changed, 9 insertions, 8 deletions

diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp
index 7b610a505..315a03741 100644
--- a/src/filters/parser/AviSplitter/AviFile.cpp
+++ b/src/filters/parser/AviSplitter/AviFile.cpp
@@ -31,6 +31,7 @@ HRESULT CAviFile::Init()
 	m_isamv = (dw[2] == FCC('AMV '));

 	Seek(0);

 	HRESULT hr = Parse(0, GetLength());

+	UNUSED_ALWAYS(hr);

 	if(m_movis.GetCount() == 0) // FAILED(hr) is allowed as long as there was a movi chunk found

 		return E_FAIL;

 

@@ -304,7 +305,7 @@ HRESULT CAviFile::BuildIndex()
 {

 	EmptyIndex();

 

-	int nSuperIndexes = 0;

+	DWORD nSuperIndexes = 0;

 

 	for(int i = 0; i < (int)m_avih.dwStreams; i++)

 	{

@@ -352,7 +353,7 @@ HRESULT CAviFile::BuildIndex()
 					return E_FAIL;

 				}

 

-				for(int k = 0, l = 0; k < (int)p->nEntriesInUse; k++)

+				for(int k = 0; k < (int)p->nEntriesInUse; k++)

 				{

 					s->cs[frame].size = size;

 					s->cs[frame].filepos = p->qwBaseOffset + p->aIndex[k].dwOffset;

@@ -398,7 +399,7 @@ HRESULT CAviFile::BuildIndex()
 			DWORD frame = 0;

 			UINT64 size = 0;

 

-			for(int j = 0, k = 0; j < len; j++)

+			for(int j = 0; j < len; j++)

 			{

 				DWORD TrackNumber = TRACKNUM(idx->aIndex[j].dwChunkId);

 

@@ -473,7 +474,7 @@ bool CAviFile::IsInterleaved(bool fKeepInfo)
 	{

 		UINT64 fpmin = _I64_MAX;

 

-		DWORD n = -1;

+		DWORD n = (DWORD)-1;

 		for(int i = 0; i < (int)m_avih.dwStreams; i++)

 		{

 			int curchunk = curchunks[i];

@@ -502,7 +503,7 @@ bool CAviFile::IsInterleaved(bool fKeepInfo)
 

 	memset(curchunks, 0, sizeof(DWORD)*m_avih.dwStreams);

 

-	strm_t::chunk2 cs2last = {-1, 0};

+	strm_t::chunk2 cs2last = {(DWORD)-1, 0};

 

 	bool fInterleaved = true;

 

diff --git a/src/filters/parser/AviSplitter/AviReportWnd.cpp b/src/filters/parser/AviSplitter/AviReportWnd.cpp
index 95a20c668..f9489f566 100644
--- a/src/filters/parser/AviSplitter/AviReportWnd.cpp
+++ b/src/filters/parser/AviSplitter/AviReportWnd.cpp
@@ -262,7 +262,7 @@ bool CAviPlotterWnd::Create(CAviFile* pAF, CRect r, CWnd* pParentWnd)
 		DWORD* curchunks = DNew DWORD[pAF->m_avih.dwStreams];

 		memset(curchunks, 0, sizeof(DWORD)*pAF->m_avih.dwStreams);

 

-		CAviFile::strm_t::chunk2 cs2last = {-1, 0};

+		CAviFile::strm_t::chunk2 cs2last = {(DWORD)-1, 0};

 

 		while(1)

 		{

diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp
index 4c6e4e213..59cd8b621 100644
--- a/src/filters/parser/AviSplitter/AviSplitter.cpp
+++ b/src/filters/parser/AviSplitter/AviSplitter.cpp
@@ -338,7 +338,7 @@ HRESULT CAviSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool CAviSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CAviSplitterFilter");

+	SetThreadName((DWORD)-1, "CAviSplitterFilter");

 

 	if(!m_pFile) return(false);

 

@@ -544,7 +544,7 @@ bool CAviSplitterFilter::DemuxLoop()
 					break;

 				}

 

-				UINT64 expectedsize = -1;

+				UINT64 expectedsize = (UINT64)-1;

 				expectedsize = f < (DWORD)s->cs.GetCount()-1

 					? s->cs[f+1].size - s->cs[f].size

 					: s->totalsize - s->cs[f].size;