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

21 files changed, 81 insertions, 46 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;

diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
index 10f117bd8..3977fde20 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
+++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
@@ -126,8 +126,10 @@ bool CBaseSplitterFileEx::Read(pssyshdr& h)
 	for(len -= 6; len > 3; len -= 3) // TODO: also store these, somewhere, if needed

 	{

 		UINT64 stream_id = BitRead(8);

+		UNUSED_ALWAYS(stream_id);

 		EXECUTE_ASSERT(BitRead(2) == 3);

 		UINT64 p_std_buff_size_bound = (BitRead(1)?1024:128)*BitRead(13);

+		UNUSED_ALWAYS(p_std_buff_size_bound);

 	}

 

 	return(true);

diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.cpp b/src/filters/parser/DSMSplitter/DSMSplitter.cpp
index bad3728e5..3329bb666 100644
--- a/src/filters/parser/DSMSplitter/DSMSplitter.cpp
+++ b/src/filters/parser/DSMSplitter/DSMSplitter.cpp
@@ -179,7 +179,7 @@ HRESULT CDSMSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool CDSMSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CDSMSplitterFilter");

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

 	return true;

 }

 

diff --git a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp
index f4448f661..cb58bd929 100644
--- a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp
+++ b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp
@@ -223,6 +223,7 @@ bool CDSMSplitterFile::Read(__int64 len, IDSMResourceBagImpl& res)
 {

 	BYTE compression = (BYTE)BitRead(2);

 	BYTE reserved = (BYTE)BitRead(6);

+	UNUSED_ALWAYS(reserved);

 	len--;

 

 	CDSMResource r;

diff --git a/src/filters/parser/DiracSplitter/DiracSplitter.cpp b/src/filters/parser/DiracSplitter/DiracSplitter.cpp
index 450eb81bb..8e6adb524 100644
--- a/src/filters/parser/DiracSplitter/DiracSplitter.cpp
+++ b/src/filters/parser/DiracSplitter/DiracSplitter.cpp
@@ -137,7 +137,7 @@ HRESULT CDiracSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool CDiracSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CDiracSplitterFilter");

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

     if(!m_pFile) return(false);

 

     // TODO

diff --git a/src/filters/parser/DiracSplitter/DiracSplitterFile.cpp b/src/filters/parser/DiracSplitter/DiracSplitterFile.cpp
index de3b42b45..5833ae0b1 100644
--- a/src/filters/parser/DiracSplitter/DiracSplitterFile.cpp
+++ b/src/filters/parser/DiracSplitter/DiracSplitterFile.cpp
@@ -97,7 +97,7 @@ UINT64 CDiracSplitterFile::UnsignedGolombDecode()
 bool CDiracSplitterFile::Next(BYTE& code, __int64 len)

 {

     BitByteAlign();

-    UINT64 qw = -1;

+    UINT64 qw = (UINT64)-1;

     do

     {

         if(len-- == 0 || GetPos() >= GetLength()) return(false);

diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Codecs/Ap4BitStream.h b/src/filters/parser/MP4Splitter/AP4/Source/Codecs/Ap4BitStream.h
index c0bb0566e..d34e97cb6 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Codecs/Ap4BitStream.h
+++ b/src/filters/parser/MP4Splitter/AP4/Source/Codecs/Ap4BitStream.h
@@ -289,7 +289,7 @@ inline AP4_UI08
 AP4_BitStream::ReadByte()
 {
    SkipBits(m_BitsCached & 7);
-   return ReadBits(8);
+   return (AP4_UI08)ReadBits(8);
 }
 
 /*----------------------------------------------------------------------
@@ -300,7 +300,7 @@ AP4_BitStream::PeekByte()
 {
    int extra_bits = m_BitsCached & 7;
    int data = PeekBits(extra_bits + 8);
-   int byte = data & 0xFF;
+   AP4_UI08 byte = data & 0xFF;
 
    return byte;
 }
diff --git a/src/filters/parser/MP4Splitter/AP4/Source/MetaData/Ap4MetaData.cpp b/src/filters/parser/MP4Splitter/AP4/Source/MetaData/Ap4MetaData.cpp
index a7b825d3a..507089a6d 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/MetaData/Ap4MetaData.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Source/MetaData/Ap4MetaData.cpp
@@ -757,9 +757,6 @@ AP4_MetaData::Entry::ToAtom(AP4_Atom*& atom) const
             atom = new AP4_DcfdAtom(m_Value->ToInteger());
             return AP4_SUCCESS;
         }
-        
-         // not supported
-         return AP4_ERROR_NOT_SUPPORTED; 
     } else {
         // create a '----' atom
         AP4_ContainerAtom* container = new AP4_ContainerAtom(AP4_ATOM_TYPE_dddd);
@@ -777,7 +774,8 @@ AP4_MetaData::Entry::ToAtom(AP4_Atom*& atom) const
         atom = container;
         return AP4_SUCCESS;
     }
-        
+
+    // not supported
     return AP4_ERROR_NOT_SUPPORTED;
 }
 
diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.cpp b/src/filters/parser/MP4Splitter/MP4Splitter.cpp
index 87e18e851..84aab0897 100644
--- a/src/filters/parser/MP4Splitter/MP4Splitter.cpp
+++ b/src/filters/parser/MP4Splitter/MP4Splitter.cpp
@@ -692,7 +692,7 @@ HRESULT CMP4SplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool CMP4SplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CMP4SplitterFilter");

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

 	AP4_Movie* movie = (AP4_Movie*)m_pFile->GetMovie();

 

 	POSITION pos = m_trackpos.GetStartPosition();

@@ -740,7 +740,7 @@ void CMP4SplitterFilter::DemuxSeek(REFERENCE_TIME rt)
 			const AP4_Array<AP4_UI32>&	Entries = stss->GetEntries();

 			if(Entries.ItemCount() > 0)

 			{

-				AP4_Cardinal i = -1;

+				AP4_Cardinal i = (AP4_Cardinal)-1;

 				while(++i < Entries.ItemCount() && Entries[i]-1 <= pPair->m_value.index);

 				if(i > 0) i--;

 				pPair->m_value.index = Entries[i]-1;

@@ -835,6 +835,7 @@ static CStringW ConvertTX3GToSSA(
 				WORD flags = mods[0]; mods += 1;

 				WORD size = mods[0]; mods += 1;

 				const AP4_Byte* color = mods; mods += 4;

+				UNUSED_ALWAYS(font_id);

 

 				if(end > str_len) end = str_len;

 

@@ -949,7 +950,7 @@ static CStringW ConvertTX3GToSSA(
 

 		int breaks = 0;

 

-		for(int i = 0, j = 0; i <= str_len; i++)

+		for(int i = 0; i <= str_len; i++)

 		{

 			if(chars[i].c == '\n' /*|| chars[i].c == ' '*/)

 			{

@@ -1064,7 +1065,7 @@ bool CMP4SplitterFilter::DemuxLoop()
 				{

 					p->bSyncPoint = FALSE;

 

-					AP4_Cardinal i = -1;

+					AP4_Cardinal i = (AP4_Cardinal)-1;

 					while(++i < stss->GetEntries().ItemCount())

 						if(stss->GetEntries()[i]-1 == pPairNext->m_value.index)

 							p->bSyncPoint = TRUE;

@@ -1142,6 +1143,7 @@ bool CMP4SplitterFilter::DemuxLoop()
 						if(mt.subtype == MEDIASUBTYPE_ASS2)

 						{

 							AP4_SampleDescription* desc = track->GetSampleDescription(sample.GetDescriptionIndex());

+							UNUSED_ALWAYS(desc);

 

 							dlgln = "0,0,Text,,0000,0000,0000,0000,," + str;

 							dlgln_plaintext = str;

@@ -1337,6 +1339,8 @@ HRESULT CMPEG4VideoSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 			{

 				BYTE visual_object_verid = (BYTE)m_pFile->BitRead(4);

 				BYTE visual_object_priority = (BYTE)m_pFile->BitRead(3);

+				UNUSED_ALWAYS(visual_object_verid);

+				UNUSED_ALWAYS(visual_object_priority);

 			}

 

 			BYTE visual_object_type = (BYTE)m_pFile->BitRead(4);

@@ -1350,12 +1354,18 @@ HRESULT CMPEG4VideoSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 					BYTE video_format = (BYTE)m_pFile->BitRead(3);

 					BYTE video_range = (BYTE)m_pFile->BitRead(1);

 					BYTE colour_description = (BYTE)m_pFile->BitRead(1);

+					UNUSED_ALWAYS(video_format);

+					UNUSED_ALWAYS(video_range);

+					UNUSED_ALWAYS(colour_description);

 

 					if(colour_description)

 					{

 						BYTE colour_primaries = (BYTE)m_pFile->BitRead(8);

 						BYTE transfer_characteristics = (BYTE)m_pFile->BitRead(8);

 						BYTE matrix_coefficients = (BYTE)m_pFile->BitRead(8);

+						UNUSED_ALWAYS(colour_primaries);

+						UNUSED_ALWAYS(transfer_characteristics);

+						UNUSED_ALWAYS(matrix_coefficients);

 					}

 				}

 			}

@@ -1380,6 +1390,7 @@ HRESULT CMPEG4VideoSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 				BYTE random_accessible_vol = (BYTE)m_pFile->BitRead(1);

 				BYTE video_object_type_indication = (BYTE)m_pFile->BitRead(8);

+				UNUSED_ALWAYS(random_accessible_vol);

 

 				if(video_object_type_indication == 0x12) // Fine Granularity Scalable

 					break; // huh

@@ -1414,6 +1425,8 @@ HRESULT CMPEG4VideoSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 					BYTE chroma_format = (BYTE)m_pFile->BitRead(2);

 					BYTE low_delay = (BYTE)m_pFile->BitRead(1);

 					BYTE vbv_parameters = (BYTE)m_pFile->BitRead(1);

+					UNUSED_ALWAYS(chroma_format);

+					UNUSED_ALWAYS(low_delay);

 

 					if(vbv_parameters)

 					{

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
index 1bbe406f1..b6fd7d03a 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
@@ -192,17 +192,20 @@ HRESULT Segment::ParseMinimal(CMatroskaNode* pMN0)
 	{

 		if(Cues.IsEmpty() && (pMN = pMN0->Child(0x1C53BB6B, false)))

 		{

-			do {Cues.Parse(pMN);} while(pMN->Next(true));

+			do {Cues.Parse(pMN);}

+			while(pMN->Next(true));

 		}

 

 		if(Chapters.IsEmpty() && (pMN = pMN0->Child(0x1043A770, false)))

 		{

-			do {Chapters.Parse(pMN); /*BIG UGLY HACK:*/ break;} while(pMN->Next(true));

+			do {Chapters.Parse(pMN); /*BIG UGLY HACK:*/ break;}

+			while(pMN->Next(true));

 		}

 

 		if(Attachments.IsEmpty() && (pMN = pMN0->Child(0x1941A469, false)))

 		{

-			do {Attachments.Parse(pMN); /*BIG UGLY HACK:*/ break;} while (pMN->Next(true));

+			do {Attachments.Parse(pMN); /*BIG UGLY HACK:*/ break;}

+			while (pMN->Next(true));

 		}

 	}

 

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
index ddfee22bf..0fc106282 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
@@ -490,7 +490,7 @@ avcsuccess:
 					memset(vf, 0, mt.FormatLength());

 					vf->nChannels = (WORD)pTE->a.Channels;

 					vf->nSamplesPerSec = (DWORD)pTE->a.SamplingFrequency;

-					vf->nMinBitsPerSec = vf->nMaxBitsPerSec = vf->nAvgBitsPerSec = -1;

+					vf->nMinBitsPerSec = vf->nMaxBitsPerSec = vf->nAvgBitsPerSec = (DWORD)-1;

 					mts.Add(mt);

 				}

 				else if(CodecID == "A_MS/ACM")

@@ -811,7 +811,7 @@ void CMatroskaSplitterFilter::SendVorbisHeaderSample()
 

 bool CMatroskaSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CMatroskaSplitterFilter");

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

 

 	CMatroskaNode Root(m_pFile);

 	if(!m_pFile

@@ -878,7 +878,7 @@ void CMatroskaSplitterFilter::DemuxSeek(REFERENCE_TIME rt)
 	{

 		rt += m_pFile->m_rtOffset;

 

-		MatroskaReader::QWORD lastCueClusterPosition = -1;

+		MatroskaReader::QWORD lastCueClusterPosition = (MatroskaReader::QWORD)-1;

 

 		Segment& s = m_pFile->m_segment;

 

diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.cpp b/src/filters/parser/MpaSplitter/MpaSplitter.cpp
index 20e748f75..eb0ccbf0c 100644
--- a/src/filters/parser/MpaSplitter/MpaSplitter.cpp
+++ b/src/filters/parser/MpaSplitter/MpaSplitter.cpp
@@ -135,7 +135,7 @@ STDMETHODIMP CMpaSplitterFilter::GetDuration(LONGLONG* pDuration)
 

 bool CMpaSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CMpaSplitterFilter");

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

 	if(!m_pFile) return(false);

 

 	// TODO

diff --git a/src/filters/parser/MpaSplitter/MpaSplitterFile.cpp b/src/filters/parser/MpaSplitter/MpaSplitterFile.cpp
index 1590eee37..6696d7807 100644
--- a/src/filters/parser/MpaSplitter/MpaSplitterFile.cpp
+++ b/src/filters/parser/MpaSplitter/MpaSplitterFile.cpp
@@ -142,8 +142,10 @@ HRESULT CMpaSplitterFile::Init()
 

 		BYTE major = (BYTE)BitRead(8);

 		BYTE revision = (BYTE)BitRead(8);

+		UNUSED_ALWAYS(revision);

 

 		BYTE flags = (BYTE)BitRead(8);

+		UNUSED_ALWAYS(flags);

 		DWORD size = 0;

 		if(BitRead(1) != 0) return E_FAIL;

 		size |= BitRead(7) << 21;

@@ -173,6 +175,7 @@ HRESULT CMpaSplitterFile::Init()
 				size |= BitRead(8) << 8;

 				size |= BitRead(8);

 				WORD flags = (WORD)BitRead(16);

+				UNUSED_ALWAYS(flags);

 

 				pos += 4+4+2+size;

 

@@ -226,7 +229,7 @@ HRESULT CMpaSplitterFile::Init()
 

 	__int64 searchlen = min(m_endpos - m_startpos, m_startpos > 0 ? 0x200 : 7);

 

-	__int64 startpos;

+	__int64 startpos = m_startpos;

 

 	Seek(m_startpos);

 

diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp
index d773abdcc..43ca7db34 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp
+++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp
@@ -374,7 +374,7 @@ HRESULT CMpegSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool CMpegSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CMpegSplitterFilter");

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

 	if(!m_pFile) return(false);

 

 	m_rtStartOffset = 0;

@@ -918,6 +918,7 @@ CString GetMediaTypeDesc(const CMediaType *_pMediaType, const CHdmvClipInfo::Str
 			else if (_pMediaType->subtype == MEDIASUBTYPE_HDMV_LPCM_AUDIO)

 			{

 				const WAVEFORMATEX_HDMV_LPCM *pInfoHDMV = GetFormatHelper(pInfoHDMV, _pMediaType);

+				UNUSED_ALWAYS(pInfoHDMV);

 				Infos.AddTail(L"HDMV LPCM");

 			}

 			else

@@ -1083,7 +1084,7 @@ STDMETHODIMP CMpegSplitterFilter::Info(long lIndex, AM_MEDIA_TYPE** ppmt, DWORD*
 				if (i == CMpegSplitterFile::subpic && s.pid == NO_SUBTITLE_PID)

 				{

 					str		= _T("No subtitles");

-					*plcid	= LCID_NOSUBTITLES;

+					*plcid	= (LCID)LCID_NOSUBTITLES;

 				}

 				else

 				{

@@ -1465,7 +1466,7 @@ HRESULT CMpegSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p)
 			if(next >= end-4) break;

 

 			int size = next - start - 4;

-

+			UNUSED_ALWAYS(size);

 

 			CAutoPtr<Packet> p2(DNew Packet());

 			p2->TrackNumber = m_p->TrackNumber;

diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp
index a955a54f7..3cd9510d7 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp
+++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp
@@ -710,6 +710,7 @@ void CMpegSplitterFile::UpdatePrograms(const trhdr& h)
 				WORD program_number = (WORD)BitRead(16);

 				BYTE reserved = (BYTE)BitRead(3);

 				WORD pid = (WORD)BitRead(13);

+				UNUSED_ALWAYS(reserved);

 				if(program_number != 0)

 				{

 					m_programs[pid].program_number = program_number;

@@ -743,6 +744,9 @@ void CMpegSplitterFile::UpdatePrograms(const trhdr& h)
 			WORD PCR_PID = (WORD)BitRead(13);

 			BYTE reserved2 = (BYTE)BitRead(4);

 			WORD program_info_length = (WORD)BitRead(12);

+			UNUSED_ALWAYS(reserved1);

+			UNUSED_ALWAYS(PCR_PID);

+			UNUSED_ALWAYS(reserved2);

 

 			len -= 4+program_info_length;

 

@@ -756,6 +760,8 @@ void CMpegSplitterFile::UpdatePrograms(const trhdr& h)
 				WORD pid = (WORD)BitRead(13);

 				BYTE nreserved2 = (BYTE)BitRead(4);

 				WORD ES_info_length = (WORD)BitRead(12);

+				UNUSED_ALWAYS(nreserved1);

+				UNUSED_ALWAYS(nreserved2);

 

 				len -= 5+ES_info_length;

 

diff --git a/src/filters/parser/NutSplitter/NutSplitter.cpp b/src/filters/parser/NutSplitter/NutSplitter.cpp
index 3938bd5e9..92dee697b 100644
--- a/src/filters/parser/NutSplitter/NutSplitter.cpp
+++ b/src/filters/parser/NutSplitter/NutSplitter.cpp
@@ -143,6 +143,7 @@ HRESULT CNutSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 		else if(sh->stream_class == CNutFile::SC_AUDIO)

 		{

 			CNutFile::audio_stream_header& ash = sh->ash;

+			UNUSED_ALWAYS(ash);

 			// TODO

 		}

 		else if(sh->stream_class == CNutFile::SC_SUBTITLE)

@@ -165,7 +166,7 @@ HRESULT CNutSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool CNutSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CNutSplitterFilter");

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

 	if(!m_pFile) return(false);

 	m_pFile->Seek(0);

 	return(true);

diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp
index f13ae5c17..fc0ce3e51 100644
--- a/src/filters/parser/OggSplitter/OggSplitter.cpp
+++ b/src/filters/parser/OggSplitter/OggSplitter.cpp
@@ -347,7 +347,7 @@ HRESULT COggSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool COggSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "COggSplitterFilter");

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

 	if(!m_pFile) return(false);

 

 	return(true);

@@ -578,7 +578,7 @@ COggSourceFilter::COggSourceFilter(LPUNKNOWN pUnk, HRESULT* phr)
 COggSplitterOutputPin::COggSplitterOutputPin(LPCWSTR pName, CBaseFilter* pFilter, CCritSec* pLock, HRESULT* phr)

 	: CBaseSplitterOutputPin(pName, pFilter, pLock, phr)

 {

-	ResetState(-1);

+	ResetState((DWORD)-1);

 }

 

 void COggSplitterOutputPin::AddComment(BYTE* p, int len)

@@ -824,6 +824,7 @@ HRESULT COggVorbisOutputPin::UnpackInitPage(OggPage& page)
 				unsigned int transformtype = bs.getbits(-16);

 				unsigned int windowtype = bs.getbits(-16);

 				unsigned int blockflag = bs.getbits(-1);

+				UNUSED_ALWAYS(mapping);

 

 				if(transformtype != 0 || windowtype != 0)

 				{

diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
index f2c04c8a7..790c44e7a 100644
--- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
+++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
@@ -422,7 +422,7 @@ HRESULT CRealMediaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 			{

 				lfi.GetNextAssoc(pos, key, value);

 

-				int n;

+				int n = 0;

 				if(key.Find("CHAPTER") == 0 && key.Find("TIME") == key.GetLength()-4

 				&& (n = strtol(key.Mid(7), NULL, 10)) > 0)

 				{

@@ -492,7 +492,7 @@ HRESULT CRealMediaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool CRealMediaSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CRealMediaSplitterFilter");

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

 

 	if(!m_pFile) return(false);

 

@@ -505,7 +505,7 @@ bool CRealMediaSplitterFilter::DemuxInit()
 

 		int stream = m_pFile->GetMasterStream();

 

-		UINT32 tLastStart = -1;

+		UINT32 tLastStart = (UINT32)-1;

 		UINT32 nPacket = 0;

 

 		POSITION pos = m_pFile->m_dcs.GetHeadPosition(); 

@@ -772,7 +772,7 @@ HRESULT CRealMediaSplitterOutputPin::DeliverSegments()
 

 	CAutoPtr<Packet> p(DNew Packet());

 

-	p->TrackNumber = -1;

+	p->TrackNumber = (DWORD)-1;

 	p->bDiscontinuity = m_segments.fDiscontinuity;

 	p->bSyncPoint = m_segments.fSyncPoint;

 	p->rtStart = m_segments.rtStart;

@@ -1010,7 +1010,7 @@ HRESULT CRMFile::Read(ChunkHdr& hdr)
 HRESULT CRMFile::Read(MediaPacketHeader& mph, bool fFull)

 {

 	memset(&mph, 0, FIELD_OFFSET(MediaPacketHeader, pData));

-	mph.stream = -1;

+	mph.stream = (UINT16)-1;

 

 	HRESULT hr;

 

@@ -1779,7 +1779,8 @@ HRESULT CRealVideoDecoder::CheckInputType(const CMediaType* mtIn)
 		paths.AddTail(olddll); // default dll paths

 

 		POSITION pos = paths.GetHeadPosition();

-		while(pos && !(m_hDrvDll = LoadLibrary(paths.GetNext(pos))));

+		do { if (pos) m_hDrvDll = LoadLibrary(paths.GetNext(pos));

+		} while(pos && !m_hDrvDll);

 

 		if(m_hDrvDll)

 		{

@@ -1853,7 +1854,7 @@ HRESULT CRealVideoDecoder::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tSto
 {

 	CAutoLock cAutoLock(&m_csReceive);

 

-	m_timestamp = ~0;

+	m_timestamp = (DWORD)~0;

 	m_fDropFrames = false;

 

 	DWORD tmp[2] = {20, 0};

@@ -2005,6 +2006,7 @@ HRESULT CRealAudioDecoder::Receive(IMediaSample* pIn)
 	BYTE* pDataIn = NULL;

 	if(FAILED(hr = pIn->GetPointer(&pDataIn))) return hr;

 	BYTE* pDataInOrg = pDataIn;

+	UNUSED_ALWAYS(pDataInOrg);

 

 	long len = pIn->GetActualDataLength();

 	if(len <= 0) return S_OK;

@@ -2140,8 +2142,8 @@ HRESULT CRealAudioDecoder::Receive(IMediaSample* pIn)
 

 		pOut->SetActualDataLength(len);

 

-DbgLog((LOG_TRACE, 0, _T("A: rtStart=%I64d, rtStop=%I64d, disc=%d, sync=%d"), 

-rtStart, rtStop, pOut->IsDiscontinuity() == S_OK, pOut->IsSyncPoint() == S_OK));

+		DbgLog((LOG_TRACE, 0, _T("A: rtStart=%I64d, rtStop=%I64d, disc=%d, sync=%d"), 

+			rtStart, rtStop, pOut->IsDiscontinuity() == S_OK, pOut->IsSyncPoint() == S_OK));

 

 		if(rtStart >= 0 && S_OK != (hr = m_pOutput->Deliver(pOut)))

 			return hr;

@@ -2219,7 +2221,8 @@ HRESULT CRealAudioDecoder::CheckInputType(const CMediaType* mtIn)
 		paths.AddTail(olddll); // default dll paths

 

 		POSITION pos = paths.GetHeadPosition();

-		while(pos && !(m_hDrvDll = LoadLibrary(paths.GetNext(pos))));

+		do { if (pos) m_hDrvDll = LoadLibrary(paths.GetNext(pos));

+		} while(pos && !m_hDrvDll);

 

 		if(m_hDrvDll)

 		{

@@ -2352,6 +2355,7 @@ HRESULT CRealAudioDecoder::StartStreaming()
 	int w = m_rai.coded_frame_size;

 	int h = m_rai.sub_packet_h;

 	int sps = m_rai.sub_packet_size;

+	UNUSED_ALWAYS(sps);

 

 	int len = w*h;

 

diff --git a/src/filters/parser/RoQSplitter/RoQSplitter.cpp b/src/filters/parser/RoQSplitter/RoQSplitter.cpp
index c909b8168..78330a3a9 100644
--- a/src/filters/parser/RoQSplitter/RoQSplitter.cpp
+++ b/src/filters/parser/RoQSplitter/RoQSplitter.cpp
@@ -239,7 +239,7 @@ HRESULT CRoQSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
 

 bool CRoQSplitterFilter::DemuxInit()

 {

-	SetThreadName(-1, "CRoQSplitterFilter");

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

 	m_indexpos = m_index.GetHeadPosition();

 

 	return(true);

@@ -871,6 +871,7 @@ HRESULT CRoQAudioDecoder::Transform(IMediaSample* pIn, IMediaSample* pOut)
 	}

 

 	WAVEFORMATEX* pwfe = (WAVEFORMATEX*)m_pOutput->CurrentMediaType().Format();

+	UNUSED_ALWAYS(pwfe);

 

 	BYTE* pDataIn = NULL;

 	if(FAILED(hr = pIn->GetPointer(&pDataIn)))