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/FLVSplitter | |
| 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/FLVSplitter')
| -rw-r--r-- | src/filters/parser/FLVSplitter/FLVSplitter.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.cpp b/src/filters/parser/FLVSplitter/FLVSplitter.cpp index f68083b9f..51c773902 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.cpp +++ b/src/filters/parser/FLVSplitter/FLVSplitter.cpp @@ -569,7 +569,7 @@ HRESULT CFLVSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) bool CFLVSplitterFilter::DemuxInit()
{
- SetThreadName(-1, "CFLVSplitterFilter");
+ SetThreadName((DWORD)-1, "CFLVSplitterFilter");
return true;
}
@@ -652,7 +652,7 @@ void CFLVSplitterFilter::AlternateSeek(REFERENCE_TIME rt) while (true) {
bool foundAudio = false;
bool foundVideo = false;
- __int64 bestPos;
+ __int64 bestPos = 0;
estimPos = max(estimPos - seekBack, m_DataOffset);
seekBack *= 2;
@@ -711,14 +711,17 @@ bool CFLVSplitterFilter::DemuxLoop() if((t.DataSize > 0) && (t.TagType == 8 && ReadTag(at) || t.TagType == 9 && ReadTag(vt)))
{
UINT32 tsOffset = 0;
- if(t.TagType == 9 && vt.FrameType == 5) goto NextTag; // video info/command frame
- if(t.TagType == 9 && vt.CodecID == 4) m_pFile->BitRead(8);
- if(t.TagType == 9 && vt.CodecID == 5) m_pFile->BitRead(32);
- if(t.TagType == 9 && vt.CodecID == 7) {
- if (m_pFile->BitRead(8) != 1) goto NextTag;
- // Tag timestamps specify decode time, this is the display time offset
- tsOffset = m_pFile->BitRead(24);
- tsOffset = (tsOffset + 0xff800000) ^ 0xff800000; // sign extension
+ if(t.TagType == 9)
+ {
+ if(vt.FrameType == 5) goto NextTag; // video info/command frame
+ if(vt.CodecID == 4) m_pFile->BitRead(8);
+ else if(vt.CodecID == 5) m_pFile->BitRead(32);
+ else if(vt.CodecID == 7) {
+ if (m_pFile->BitRead(8) != 1) goto NextTag;
+ // Tag timestamps specify decode time, this is the display time offset
+ tsOffset = m_pFile->BitRead(24);
+ tsOffset = (tsOffset + 0xff800000) ^ 0xff800000; // sign extension
+ }
}
if(t.TagType == 8 && at.SoundFormat == 10) {
if (m_pFile->BitRead(8) != 1) goto NextTag;
|