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

2 files changed, 10 insertions, 3 deletions

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;