diff options
author | jonasno <jonasno@users.sourceforge.net> | 2011-05-06 02:11:00 +0400 |
---|---|---|
committer | jonasno <jonasno@users.sourceforge.net> | 2011-05-06 02:11:00 +0400 |
commit | 92aedeec1d7ee6e8469a62f9baf1d4d378482977 (patch) | |
tree | 88a309ec39af9456319673cffbabf965ef24f4ab /src/filters/parser/OggSplitter | |
parent | 3ef39dd27623933a13115ae8d198f37c745bfb29 (diff) |
More code improvement and fixed some more warnings
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3087 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/parser/OggSplitter')
-rw-r--r-- | src/filters/parser/OggSplitter/OggSplitter.cpp | 5 | ||||
-rw-r--r-- | src/filters/parser/OggSplitter/OggSplitter.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp index 7a341b12b..1d5796456 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.cpp +++ b/src/filters/parser/OggSplitter/OggSplitter.cpp @@ -638,7 +638,7 @@ void COggSplitterOutputPin::ResetState(DWORD seqnum) HRESULT COggSplitterOutputPin::UnpackPage(OggPage& page)
{
- if(m_lastseqnum != page.m_hdr.page_sequence_number-1) {
+ if(m_lastseqnum != page.m_hdr.page_sequence_number - 1) {
ResetState(page.m_hdr.page_sequence_number);
return S_FALSE; // FIXME
} else {
@@ -809,7 +809,7 @@ HRESULT COggVorbisOutputPin::UnpackInitPage(OggPage& page) ;
}
for(int cnt = 0; bs.hasbits(-8-16-16-1-6); cnt++) {
- unsigned int modes = bs.showbits(-6)+1;
+ unsigned int modes = bs.showbits(-6) + 1;
unsigned int mapping = bs.getbits(-8);
unsigned int transformtype = bs.getbits(-16);
@@ -819,6 +819,7 @@ HRESULT COggVorbisOutputPin::UnpackInitPage(OggPage& page) if(transformtype != 0 || windowtype != 0) {
ASSERT(modes == cnt);
+ UNREFERENCED_PARAMETER(modes);
break;
}
diff --git a/src/filters/parser/OggSplitter/OggSplitter.h b/src/filters/parser/OggSplitter/OggSplitter.h index 3d7ae5975..c2067d735 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.h +++ b/src/filters/parser/OggSplitter/OggSplitter.h @@ -52,7 +52,7 @@ protected: CCritSec m_csPackets;
CAutoPtrList<OggPacket> m_packets;
CAutoPtr<OggPacket> m_lastpacket;
- int m_lastseqnum;
+ DWORD m_lastseqnum;
REFERENCE_TIME m_rtLast;
bool m_fSkip;
|