diff options
author | kinddragon <kinddragon@users.sourceforge.net> | 2010-05-16 23:28:57 +0400 |
---|---|---|
committer | kinddragon <kinddragon@users.sourceforge.net> | 2010-05-16 23:28:57 +0400 |
commit | e9e09d64fbc9c884e7e00f22bfa9de18b8748bb9 (patch) | |
tree | 1a147ec652bb6baef603d72fc6bb9129c416b38b /src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp | |
parent | 3a990e7f323a3f68c286ad8b3395c681368ff46b (diff) |
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
Diffstat (limited to 'src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp')
-rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp index acb44acef..10f117bd8 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -49,7 +49,7 @@ CBaseSplitterFileEx::~CBaseSplitterFileEx() bool CBaseSplitterFileEx::NextMpegStartCode(BYTE& code, __int64 len)
{
BitByteAlign();
- DWORD dw = -1;
+ DWORD dw = (DWORD)-1;
do
{
if(len-- == 0 || !GetRemaining()) return(false);
@@ -284,11 +284,13 @@ bool CBaseSplitterFileEx::Read(seqhdr& h, int len, CMediaType* pmt) h.vbv = (DWORD)BitRead(10);
h.constrained = BitRead(1);
- if(h.fiqm = BitRead(1))
+ h.fiqm = BitRead(1);
+ if(h.fiqm)
for(int i = 0; i < countof(h.iqm); i++)
h.iqm[i] = (BYTE)BitRead(8);
- if(h.fniqm = BitRead(1))
+ h.fniqm = BitRead(1);
+ if(h.fniqm)
for(int i = 0; i < countof(h.niqm); i++)
h.niqm[i] = (BYTE)BitRead(8);
@@ -1097,7 +1099,9 @@ bool CBaseSplitterFileEx::Read(pvahdr& h, bool fSync) if(!NextMpegStartCode(b, 4)) return(false);
peshdr h2;
if(!Read(h2, b)) return(false);
- if(h.fpts = h2.fpts) h.pts = h2.pts;
+ // Maybe bug, code before: if(h.fpts = h2.fpts) h.pts = h2.pts;
+ h.fpts = h2.fpts;
+ if(h.fpts) h.pts = h2.pts;
}
BitRead(8*h.prebytes);
@@ -1633,10 +1637,6 @@ bool CBaseSplitterFileEx::Read(vc1hdr& h, int len, CMediaType* pmt) bool CBaseSplitterFileEx::Read(dvbsub& h, int len, CMediaType* pmt)
{
- __int64 endpos = GetPos() + len; // - sequence header length
- __int64 extrapos = 0, extralen = 0;
- int nFrameRateNum = 0, nFrameRateDen = 1;
-
if ((BitRead(32, true) & 0xFFFFFF00) == 0x20000f00)
{
static const SUBTITLEINFO SubFormat = { 0, "", L"" };
|