diff options
author | kinddragon <kinddragon@users.sourceforge.net> | 2010-05-29 08:04:26 +0400 |
---|---|---|
committer | kinddragon <kinddragon@users.sourceforge.net> | 2010-05-29 08:04:26 +0400 |
commit | 158e31fbcc38e59cba2451ad5a2bccf69ea697d1 (patch) | |
tree | 1b926f2877ee61d5f052a559fc2f67c10f8bc0eb /src/filters/transform/Mpeg2DecFilter | |
parent | 02072325a68d4fb294c3ba4f58048c42de3b9e0a (diff) |
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
Diffstat (limited to 'src/filters/transform/Mpeg2DecFilter')
-rw-r--r-- | src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp | 17 | ||||
-rw-r--r-- | src/filters/transform/Mpeg2DecFilter/libmpeg2.cpp | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp index 36bb391bf..d169da078 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp @@ -200,16 +200,20 @@ CMpeg2DecFilter::CMpeg2DecFilter(LPUNKNOWN lpunk, HRESULT* phr) if(FAILED(*phr)) return;
- if(!(m_pInput = DNew CMpeg2DecInputPin(this, phr, L"Video"))) *phr = E_OUTOFMEMORY;
+ m_pInput = DNew CMpeg2DecInputPin(this, phr, L"Video");
+ if(!m_pInput) *phr = E_OUTOFMEMORY;
if(FAILED(*phr)) return;
-// if(!(m_pOutput = DNew CMpeg2DecOutputPin(this, phr, L"Output"))) *phr = E_OUTOFMEMORY;
+// m_pOutput = DNew CMpeg2DecOutputPin(this, phr, L"Output");
+// if(!m_pOutput) *phr = E_OUTOFMEMORY;
// if(FAILED(*phr)) return;
- if(!(m_pSubpicInput = DNew CSubpicInputPin(this, phr))) *phr = E_OUTOFMEMORY;
+ m_pSubpicInput = DNew CSubpicInputPin(this, phr);
+ if(!m_pSubpicInput) *phr = E_OUTOFMEMORY;
if(FAILED(*phr)) return;
- if(!(m_pClosedCaptionOutput = DNew CClosedCaptionOutputPin(this, m_pLock, phr))) *phr = E_OUTOFMEMORY;
+ m_pClosedCaptionOutput = DNew CClosedCaptionOutputPin(this, m_pLock, phr);
+ if(!m_pClosedCaptionOutput) *phr = E_OUTOFMEMORY;
if(FAILED(*phr)) return;
SetDeinterlaceMethod(DIAuto);
@@ -522,6 +526,8 @@ HRESULT CMpeg2DecFilter::Transform(IMediaSample* pIn) REFERENCE_TIME rtStart = m_fb.rtStart;
REFERENCE_TIME rtStop = m_fb.rtStop;
+ UNUSED_ALWAYS(rtStart);
+ UNUSED_ALWAYS(rtStop);
//
@@ -1260,12 +1266,14 @@ STDMETHODIMP CMpeg2DecInputPin::Get(REFGUID PropSet, ULONG Id, LPVOID pInstanceD case AM_RATE_SimpleRateChange:
{
AM_SimpleRateChange* p = (AM_SimpleRateChange*)pPropertyData;
+ UNUSED_ALWAYS(p);
return E_PROP_ID_UNSUPPORTED;
}
break;
case AM_RATE_MaxFullDataRate:
{
AM_MaxFullDataRate* p = (AM_MaxFullDataRate*)pPropertyData;
+ UNUSED_ALWAYS(p);
*p = 8*10000;
*pBytesReturned = sizeof(AM_MaxFullDataRate);
}
@@ -1576,7 +1584,6 @@ HRESULT CSubpicInputPin::Transform(IMediaSample* pSample) POSITION pos = m_sps.GetTailPosition();
while(pos)
{
- POSITION cur = pos;
spu* sp = m_sps.GetPrev(pos);
if(sp->m_rtStop == _I64_MAX)
{
diff --git a/src/filters/transform/Mpeg2DecFilter/libmpeg2.cpp b/src/filters/transform/Mpeg2DecFilter/libmpeg2.cpp index 6251a2bf5..57af63dc4 100644 --- a/src/filters/transform/Mpeg2DecFilter/libmpeg2.cpp +++ b/src/filters/transform/Mpeg2DecFilter/libmpeg2.cpp @@ -850,9 +850,11 @@ int CMpeg2Dec::mpeg2_header_sequence() return 1;
int i = (buffer[0] << 16) | (buffer[1] << 8) | buffer[2];
- if(!(sequence->display_width = sequence->picture_width = i >> 12))
+ sequence->display_width = sequence->picture_width = i >> 12;
+ if(!sequence->display_width)
return 1;
- if(!(sequence->display_height = sequence->picture_height = i & 0xfff))
+ sequence->display_height = sequence->picture_height = i & 0xfff;
+ if(!sequence->display_height)
return 1;
sequence->width = (sequence->picture_width + 15) & ~15;
|