put back the ";" in macro calls; better be consistent. Remove excessive indentation

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5585 10f7b99b-c216-0410-bff0-8a66a9350fd8

8 files changed, 111 insertions, 111 deletions

diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
index dc3d3e88a..b8b429c69 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp
+++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp
@@ -415,12 +415,12 @@ HRESULT CBaseSplitterOutputPin::QueuePacket(CAutoPtr<Packet> p)
 

 bool CBaseSplitterOutputPin::IsDiscontinuous()

 {

-    return m_mt.majortype       == MEDIATYPE_Text

-           || m_mt.majortype    == MEDIATYPE_ScriptCommand

-           || m_mt.majortype    == MEDIATYPE_Subtitle

-           || m_mt.subtype      == MEDIASUBTYPE_DVD_SUBPICTURE

-           || m_mt.subtype      == MEDIASUBTYPE_CVD_SUBPICTURE

-           || m_mt.subtype      == MEDIASUBTYPE_SVCD_SUBPICTURE;

+    return m_mt.majortype    == MEDIATYPE_Text

+           || m_mt.majortype == MEDIATYPE_ScriptCommand

+           || m_mt.majortype == MEDIATYPE_Subtitle

+           || m_mt.subtype   == MEDIASUBTYPE_DVD_SUBPICTURE

+           || m_mt.subtype   == MEDIASUBTYPE_CVD_SUBPICTURE

+           || m_mt.subtype   == MEDIASUBTYPE_SVCD_SUBPICTURE;

 }

 

 bool CBaseSplitterOutputPin::IsActive()

@@ -1254,10 +1254,10 @@ STDMETHODIMP CBaseSplitterFilter::Load(LPCOLESTR pszFileName, const AM_MEDIA_TYP
     }

 

     if (BuildChapters(pszFileName, Items, Chapters)) {

-        POSITION        pos = Chapters.GetHeadPosition();

-        int             i   = 1;

+        POSITION pos = Chapters.GetHeadPosition();

+        int i = 1;

         while (pos) {

-            CString     str;

+            CString str;

             CHdmvClipInfo::PlaylistChapter& chap = Chapters.GetNext(pos);

             if (chap.m_nMarkType == CHdmvClipInfo::EntryMark) {

                 str.Format(_T("Chapter %d"), i);

diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
index 80aa13c85..1616d3d41 100644
--- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
+++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp
@@ -83,14 +83,14 @@ bool CBaseSplitterFileEx::Read(pshdr& h)
 

         h.scr = 0;

         h.scr |= BitRead(3) << 30;

-        MARKER // 32..30

+        MARKER; // 32..30

         h.scr |= BitRead(15) << 15;

-        MARKER // 29..15

+        MARKER; // 29..15

         h.scr |= BitRead(15);

-        MARKER

-        MARKER // 14..0

+        MARKER;

+        MARKER; // 14..0

         h.bitrate = BitRead(22);

-        MARKER

+        MARKER;

     } else if ((b & 0xc4) == 0x44) {

         h.type = mpeg2;

 

@@ -98,16 +98,16 @@ bool CBaseSplitterFileEx::Read(pshdr& h)
 

         h.scr = 0;

         h.scr |= BitRead(3) << 30;

-        MARKER // 32..30

+        MARKER; // 32..30

         h.scr |= BitRead(15) << 15;

-        MARKER // 29..15

+        MARKER; // 29..15

         h.scr |= BitRead(15);

-        MARKER // 14..0

+        MARKER; // 14..0

         h.scr = (h.scr * 300 + BitRead(9)) * 10 / 27;

-        MARKER

+        MARKER;

         h.bitrate = BitRead(22);

-        MARKER

-        MARKER

+        MARKER;

+        MARKER;

         BitRead(5); // reserved

         UINT64 stuffing = BitRead(3);

         while (stuffing-- > 0) {

@@ -127,15 +127,15 @@ bool CBaseSplitterFileEx::Read(pssyshdr& h)
     memset(&h, 0, sizeof(h));

 

     WORD len = (WORD)BitRead(16);

-    MARKER

+    MARKER;

     h.rate_bound = (DWORD)BitRead(22);

-    MARKER

+    MARKER;

     h.audio_bound = (BYTE)BitRead(6);

     h.fixed_rate = !!BitRead(1);

     h.csps = !!BitRead(1);

     h.sys_audio_loc_flag = !!BitRead(1);

     h.sys_video_loc_flag = !!BitRead(1);

-    MARKER

+    MARKER;

     h.video_bound = (BYTE)BitRead(5);

 

     EXECUTE_ASSERT((BitRead(8) & 0x7f) == 0x7f); // reserved (should be 0xff, but not in reality)

@@ -224,11 +224,11 @@ bool CBaseSplitterFileEx::Read(peshdr& h, BYTE code)
 

         h.pts = 0;

         h.pts |= BitRead(3) << 30;

-        MARKER // 32..30

+        MARKER; // 32..30

         h.pts |= BitRead(15) << 15;

-        MARKER // 29..15

+        MARKER; // 29..15

         h.pts |= BitRead(15);

-        MARKER // 14..0

+        MARKER; // 14..0

         h.pts = 10000 * h.pts / 90 + m_rtPTSOffset;

     }

 

@@ -240,11 +240,11 @@ bool CBaseSplitterFileEx::Read(peshdr& h, BYTE code)
 

         h.dts = 0;

         h.dts |= BitRead(3) << 30;

-        MARKER // 32..30

+        MARKER; // 32..30

         h.dts |= BitRead(15) << 15;

-        MARKER // 29..15

+        MARKER; // 29..15

         h.dts |= BitRead(15);

-        MARKER // 14..0

+        MARKER; // 14..0

         h.dts = 10000 * h.dts / 90 + m_rtPTSOffset;

     }

 

@@ -336,7 +336,7 @@ bool CBaseSplitterFileEx::Read(seqhdr& h, int len, CMediaType* pmt)
     static int ifps[16] = {0, 1126125, 1125000, 1080000, 900900, 900000, 540000, 450450, 450000, 0, 0, 0, 0, 0, 0, 0};

     h.ifps = ifps[BitRead(4)];

     h.bitrate = (DWORD)BitRead(18);

-    MARKER

+    MARKER;

     h.vbv = (DWORD)BitRead(10);

     h.constrained = BitRead(1);

 

@@ -378,7 +378,7 @@ bool CBaseSplitterFileEx::Read(seqhdr& h, int len, CMediaType* pmt)
         h.width |= (BitRead(2) << 12);

         h.height |= (BitRead(2) << 12);

         h.bitrate |= (BitRead(12) << 18);

-        MARKER

+        MARKER;

         h.vbv |= (BitRead(8) << 10);

         h.lowdelay = BitRead(1);

         h.ifps = (DWORD)(h.ifps * (BitRead(2) + 1) / (BitRead(5) + 1));

@@ -728,7 +728,7 @@ bool CBaseSplitterFileEx::Read(ac3hdr& h, int len, CMediaType* pmt, bool find_sy
                 return true;

             }

 

-            int bitrate   = (int)(fsize * 8i64 * samplerate / framelength); // inaccurate, because fsize is not constant

+            int bitrate = (int)(fsize * 8i64 * samplerate / framelength); // inaccurate, because fsize is not constant

 

             pmt->majortype = MEDIATYPE_Audio;

             pmt->subtype = isTrueHD ? MEDIASUBTYPE_DOLBY_TRUEHD : MEDIASUBTYPE_MLP;

@@ -1003,7 +1003,7 @@ bool CBaseSplitterFileEx::Read(dvdalpcmhdr& h, int len, CMediaType* pmt)
     }

 

     h.firstaudioframe = (WORD)BitRead(16);// Byte pointer to start of first audio frame.

-    h.unknown1        = (BYTE)BitRead(8); // Unknown - e.g. 0x10 for stereo, 0x00 for surround

+    h.unknown1 = (BYTE)BitRead(8); // Unknown - e.g. 0x10 for stereo, 0x00 for surround

     if (h.unknown1 != 0x10 && h.unknown1 != 0x00) {

         return false;    // this is not the aob. maybe this is a vob.

     }

@@ -1080,7 +1080,7 @@ bool CBaseSplitterFileEx::Read(hdmvlpcmhdr& h, CMediaType* pmt)
     wfe.wFormatTag = WAVE_FORMAT_PCM;

 

     static int channels[] = {0, 1, 0, 2, 3, 3, 4, 4, 5, 6, 7, 8};

-    wfe.nChannels    = channels[h.channels];

+    wfe.nChannels = channels[h.channels];

     wfe.channel_conf = h.channels;

 

     static int freq[] = {0, 48000, 0, 0, 96000, 192000};

@@ -1089,7 +1089,7 @@ bool CBaseSplitterFileEx::Read(hdmvlpcmhdr& h, CMediaType* pmt)
     static int bitspersample[] = {0, 16, 20, 24};

     wfe.wBitsPerSample = bitspersample[h.bitpersample];

 

-    wfe.nBlockAlign     = wfe.nChannels * wfe.wBitsPerSample >> 3;

+    wfe.nBlockAlign = wfe.nChannels * wfe.wBitsPerSample >> 3;

     wfe.nAvgBytesPerSec = wfe.nBlockAlign * wfe.nSamplesPerSec;

 

     pmt->majortype  = MEDIATYPE_Audio;

@@ -1134,9 +1134,9 @@ bool CBaseSplitterFileEx::Read(mlphdr& h, int len, CMediaType* pmt, bool find_sy
             return true;

         }

 

-        int bitrate   = (int)(fsize * 8i64 * samplerate / framelength); // inaccurate, because fsize is not constant

-        pmt->majortype = MEDIATYPE_Audio;

-        pmt->subtype = MEDIASUBTYPE_MLP;

+        int bitrate     = (int)(fsize * 8i64 * samplerate / framelength); // inaccurate, because fsize is not constant

+        pmt->majortype  = MEDIATYPE_Audio;

+        pmt->subtype    = MEDIASUBTYPE_MLP;

         pmt->formattype = FORMAT_WaveFormatEx;

 

         WAVEFORMATEX* wfe = (WAVEFORMATEX*)pmt->AllocFormatBuffer(sizeof(WAVEFORMATEX));

@@ -1525,8 +1525,8 @@ int CBaseSplitterFileEx::HrdParameters(CGolombBuffer& gb)
 

 void CBaseSplitterFileEx::RemoveMpegEscapeCode(BYTE* dst, BYTE* src, int length)

 {

-    int     si = 0;

-    int     di = 0;

+    int si = 0;

+    int di = 0;

     while (si + 2 < length) {

         //remove escapes (very rare 1:2^22)

         if (src[si + 2] > 3) {

@@ -2041,38 +2041,38 @@ bool CBaseSplitterFileEx::Read(vc1hdr& h, int len, CMediaType* pmt, int guid_fla
 

     __int64 endpos = GetPos() + len; // - sequence header length

     __int64 extrapos = 0, extralen = 0;

-    int     nFrameRateNum = 0, nFrameRateDen = 1;

+    int nFrameRateNum = 0, nFrameRateDen = 1;

 

     if (GetPos() < endpos + 4 && BitRead(32, true) == 0x0000010F) {

         extrapos = GetPos();

 

         BitRead(32);

 

-        h.profile           = (BYTE)BitRead(2);

+        h.profile = (BYTE)BitRead(2);

 

         // Check if advanced profile

         if (h.profile != 3) {

             return false;

         }

 

-        h.level             = (BYTE)BitRead(3);

-        h.chromaformat      = (BYTE)BitRead(2);

+        h.level = (BYTE)BitRead(3);

+        h.chromaformat = (BYTE)BitRead(2);

 

         // (fps-2)/4 (->30)

-        h.frmrtq_postproc   = (BYTE)BitRead(3); //common

+        h.frmrtq_postproc = (BYTE)BitRead(3); //common

         // (bitrate-32kbps)/64kbps

-        h.bitrtq_postproc   = (BYTE)BitRead(5); //common

-        h.postprocflag      = (BYTE)BitRead(1); //common

-

-        h.width             = ((unsigned int)BitRead(12) + 1) << 1;

-        h.height            = ((unsigned int)BitRead(12) + 1) << 1;

-

-        h.broadcast         = (BYTE)BitRead(1);

-        h.interlace         = (BYTE)BitRead(1);

-        h.tfcntrflag        = (BYTE)BitRead(1);

-        h.finterpflag       = (BYTE)BitRead(1);

-        BitRead(1); // reserved

-        h.psf               = (BYTE)BitRead(1);

+        h.bitrtq_postproc = (BYTE)BitRead(5); //common

+        h.postprocflag = (BYTE)BitRead(1); //common

+

+        h.width  = ((unsigned int)BitRead(12) + 1) << 1;

+        h.height = ((unsigned int)BitRead(12) + 1) << 1;

+

+        h.broadcast   = (BYTE)BitRead(1);

+        h.interlace   = (BYTE)BitRead(1);

+        h.tfcntrflag  = (BYTE)BitRead(1);

+        h.finterpflag = (BYTE)BitRead(1);

+        BitRead(1);   // reserved

+        h.psf = (BYTE)BitRead(1);

         if (BitRead(1)) {

             int ar = 0;

             BitRead(14);

@@ -2184,9 +2184,9 @@ bool CBaseSplitterFileEx::Read(dvbsub& h, int len, CMediaType* pmt)
     if ((BitRead(32, true) & 0xFFFFFF00) == 0x20000f00) {

         static const SUBTITLEINFO SubFormat = { 0, "", L"" };

 

-        pmt->majortype      = MEDIATYPE_Subtitle;

-        pmt->subtype        = MEDIASUBTYPE_DVB_SUBTITLES;

-        pmt->formattype     = FORMAT_None;

+        pmt->majortype  = MEDIATYPE_Subtitle;

+        pmt->subtype    = MEDIASUBTYPE_DVB_SUBTITLES;

+        pmt->formattype = FORMAT_None;

         pmt->SetFormat((BYTE*)&SubFormat, sizeof(SUBTITLEINFO));

 

         return true;

diff --git a/src/filters/parser/BaseSplitter/MultiFiles.cpp b/src/filters/parser/BaseSplitter/MultiFiles.cpp
index d8d308131..57dd8f9cc 100644
--- a/src/filters/parser/BaseSplitter/MultiFiles.cpp
+++ b/src/filters/parser/BaseSplitter/MultiFiles.cpp
@@ -53,10 +53,10 @@ BOOL CMultiFiles::Open(LPCTSTR lpszFileName, UINT nOpenFlags)
 

 BOOL CMultiFiles::OpenFiles(CAtlList<CHdmvClipInfo::PlaylistItem>& files, UINT nOpenFlags)

 {

-    POSITION        pos = files.GetHeadPosition();

-    LARGE_INTEGER   llSize;

-    int             nPos  = 0;

-    REFERENCE_TIME  rtDur = 0;

+    POSITION pos = files.GetHeadPosition();

+    LARGE_INTEGER llSize;

+    int nPos = 0;

+    REFERENCE_TIME rtDur = 0;

 

     Reset();

     while (pos) {

@@ -84,8 +84,8 @@ BOOL CMultiFiles::OpenFiles(CAtlList<CHdmvClipInfo::PlaylistItem>& files, UINT n
 

 ULONGLONG CMultiFiles::Seek(LONGLONG lOff, UINT nFrom)

 {

-    LARGE_INTEGER   llNewPos;

-    LARGE_INTEGER   llOff;

+    LARGE_INTEGER llNewPos;

+    LARGE_INTEGER llOff;

 

     if (m_strFiles.GetCount() == 1) {

         llOff.QuadPart = lOff;

@@ -93,9 +93,9 @@ ULONGLONG CMultiFiles::Seek(LONGLONG lOff, UINT nFrom)
 

         return llNewPos.QuadPart;

     } else {

-        ULONGLONG   lAbsolutePos = GetAbsolutePosition(lOff, nFrom);

-        int         nNewPart     = 0;

-        ULONGLONG   llSum        = 0;

+        ULONGLONG lAbsolutePos = GetAbsolutePosition(lOff, nFrom);

+        int nNewPart = 0;

+        ULONGLONG llSum = 0;

 

         while (m_FilesSize[nNewPart] + llSum <= lAbsolutePos) {

             llSum += m_FilesSize[nNewPart];

@@ -112,8 +112,8 @@ ULONGLONG CMultiFiles::Seek(LONGLONG lOff, UINT nFrom)
 

 ULONGLONG CMultiFiles::GetAbsolutePosition(LONGLONG lOff, UINT nFrom)

 {

-    LARGE_INTEGER   llNoMove = {0, 0};

-    LARGE_INTEGER   llCurPos;

+    LARGE_INTEGER llNoMove = {0, 0};

+    LARGE_INTEGER llCurPos;

 

     switch (nFrom) {

         case begin :

@@ -131,7 +131,7 @@ ULONGLONG CMultiFiles::GetAbsolutePosition(LONGLONG lOff, UINT nFrom)
 ULONGLONG CMultiFiles::GetLength() const

 {

     if (m_strFiles.GetCount() == 1) {

-        LARGE_INTEGER   llSize;

+        LARGE_INTEGER llSize;

         GetFileSizeEx(m_hFile, &llSize);

         return llSize.QuadPart;

     } else {

@@ -141,7 +141,7 @@ ULONGLONG CMultiFiles::GetLength() const
 

 UINT CMultiFiles::Read(void* lpBuf, UINT nCount)

 {

-    DWORD       dwRead;

+    DWORD dwRead;

     do {

         if (!ReadFile(m_hFile, lpBuf, nCount, &dwRead, NULL)) {

             break;

@@ -149,8 +149,8 @@ UINT CMultiFiles::Read(void* lpBuf, UINT nCount)
 

         if (dwRead != nCount && (m_nCurPart < 0 || (size_t)m_nCurPart < m_strFiles.GetCount() - 1)) {

             OpenPart(m_nCurPart + 1);

-            lpBuf    = (void*)((BYTE*)lpBuf + dwRead);

-            nCount  -= dwRead;

+            lpBuf = (void*)((BYTE*)lpBuf + dwRead);

+            nCount -= dwRead;

         }

     } while (nCount != dwRead && (m_nCurPart < 0 || (size_t)m_nCurPart < m_strFiles.GetCount() - 1));

     return dwRead;

@@ -172,15 +172,15 @@ BOOL CMultiFiles::OpenPart(int nPart)
     if (m_nCurPart == nPart) {

         return TRUE;

     } else {

-        CString     fn;

+        CString fn;

 

         ClosePart();

 

-        fn          = m_strFiles.GetAt(nPart);

-        m_hFile     = CreateFile(fn, GENERIC_READ, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);

+        fn = m_strFiles.GetAt(nPart);

+        m_hFile = CreateFile(fn, GENERIC_READ, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);

 

         if (m_hFile != INVALID_HANDLE_VALUE) {

-            m_nCurPart  = nPart;

+            m_nCurPart = nPart;

             if (m_pCurrentPTSOffset != NULL) {

                 *m_pCurrentPTSOffset = m_rtPtsOffsets[nPart];

             }

@@ -194,7 +194,7 @@ void CMultiFiles::ClosePart()
 {

     if (m_hFile != INVALID_HANDLE_VALUE) {

         CloseHandle(m_hFile);

-        m_hFile     = INVALID_HANDLE_VALUE;

-        m_nCurPart  = -1;

+        m_hFile = INVALID_HANDLE_VALUE;

+        m_nCurPart = -1;

     }

 }

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
index 1118d565c..e50551153 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
@@ -422,11 +422,11 @@ avcsuccess:
                     memset(mt.Format(), 0, mt.FormatLength());

                     memcpy(mt.Format() + sizeof(MPEG1VIDEOINFO), pTE->CodecPrivate.GetData(), pTE->CodecPrivate.GetCount());

 

-                    pm1vi->hdr.bmiHeader.biSize         = sizeof(pm1vi->hdr.bmiHeader);

-                    pm1vi->hdr.bmiHeader.biWidth        = (LONG)pTE->v.PixelWidth;

-                    pm1vi->hdr.bmiHeader.biHeight       = (LONG)pTE->v.PixelHeight;

-                    pm1vi->hdr.bmiHeader.biBitCount     = 12;

-                    pm1vi->hdr.bmiHeader.biSizeImage    = DIBSIZE(pm1vi->hdr.bmiHeader);

+                    pm1vi->hdr.bmiHeader.biSize      = sizeof(pm1vi->hdr.bmiHeader);

+                    pm1vi->hdr.bmiHeader.biWidth     = (LONG)pTE->v.PixelWidth;

+                    pm1vi->hdr.bmiHeader.biHeight    = (LONG)pTE->v.PixelHeight;

+                    pm1vi->hdr.bmiHeader.biBitCount  = 12;

+                    pm1vi->hdr.bmiHeader.biSizeImage = DIBSIZE(pm1vi->hdr.bmiHeader);

 

                     mt.SetSampleSize(pm1vi->hdr.bmiHeader.biWidth * pm1vi->hdr.bmiHeader.biHeight * 4);

                     if (!bHasVideo) {

diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp
index 7ac479ff0..a58b02042 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp
+++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp
@@ -1177,8 +1177,8 @@ STDMETHODIMP CMpegSplitterFilter::Enable(long lIndex, DWORD dwFlags)
                 }

 

                 if (m_useFastStreamChange) {

-                    PauseGraph

-                    ResumeGraph

+                    PauseGraph;

+                    ResumeGraph;

                 }

 

                 HRESULT hr;

@@ -1782,12 +1782,12 @@ HRESULT CMpegSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p)
         BYTE* start = m_p->GetData();

         BYTE* end = start + m_p->GetCount();

 

-        MOVE_TO_H264_START_CODE(start, end)

+        MOVE_TO_H264_START_CODE(start, end);

 

         while (start <= end - 4) {

             BYTE* next = start + 1;

 

-            MOVE_TO_H264_START_CODE(next, end)

+            MOVE_TO_H264_START_CODE(next, end);

 

             if (next >= end - 4) {

                 break;

@@ -2115,9 +2115,9 @@ HRESULT CMpegSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p)
 

 STDMETHODIMP CMpegSplitterOutputPin::Connect(IPin* pReceivePin, const AM_MEDIA_TYPE* pmt)

 {

-    HRESULT     hr;

-    PIN_INFO    PinInfo;

-    GUID        FilterClsid;

+    HRESULT hr;

+    PIN_INFO PinInfo;

+    GUID FilterClsid;

 

     if (SUCCEEDED(pReceivePin->QueryPinInfo(&PinInfo))) {

         if (SUCCEEDED(PinInfo.pFilter->GetClassID(&FilterClsid))) {

diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp
index ecd874257..b2fb313d0 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp
+++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp
@@ -881,8 +881,8 @@ void CMpegSplitterFile::AddHdmvPGStream(WORD pid, const char* language_code)
 {

     stream s;

 

-    s.pid       = pid;

-    s.pesid     = 0xbd;

+    s.pid   = pid;

+    s.pesid = 0xbd;

 

     CMpegSplitterFile::hdmvsubhdr h;

     if (!m_streams[subpic].Find(s) && Read(h, &s.mt, language_code)) {

@@ -1005,8 +1005,8 @@ void CMpegSplitterFile::UpdatePrograms(CGolombBuffer gb, WORD pid, bool UpdateLa
             UNREFERENCED_PARAMETER(nreserved1);

             UNREFERENCED_PARAMETER(nreserved2);

 

-            pPair->m_value.streams[i].pid   = pid;

-            pPair->m_value.streams[i].type  = (PES_STREAM_TYPE)stream_type;

+            pPair->m_value.streams[i].pid  = pid;

+            pPair->m_value.streams[i].type = (PES_STREAM_TYPE)stream_type;

 

             if (m_ForcedSub) {

                 if (stream_type == PRESENTATION_GRAPHICS_STREAM) {

diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp
index 4de42f37c..f7498fbfc 100644
--- a/src/filters/parser/OggSplitter/OggSplitter.cpp
+++ b/src/filters/parser/OggSplitter/OggSplitter.cpp
@@ -1288,8 +1288,8 @@ HRESULT COggTheoraOutputPin::UnpackInitPage(OggPage& page)
 

 REFERENCE_TIME COggTheoraOutputPin::GetRefTime(__int64 granule_position)

 {

-    LONGLONG    iframe;

-    LONGLONG    pframe;

+    LONGLONG iframe;

+    LONGLONG pframe;

 

     iframe = granule_position >> m_KfgShift;

     pframe = granule_position - (iframe << m_KfgShift);

diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
index 6eef4d081..e21856125 100644
--- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
+++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
@@ -277,12 +277,12 @@ HRESULT CRealMediaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
             pvih->bmiHeader.biSizeImage = rvi.w * rvi.h * 3 / 2;

             mts.Add(mt);

 

-            BYTE* extra     = pmp->typeSpecData.GetData();

-            DWORD extralen  = (DWORD)pmp->typeSpecData.GetCount();

+            BYTE* extra = pmp->typeSpecData.GetData();

+            DWORD extralen = (DWORD)pmp->typeSpecData.GetCount();

 

             if (extralen > 26) {

-                extra       += 26;

-                extralen    -= 26;

+                extra += 26;

+                extralen -= 26;

                 VIDEOINFOHEADER* pvih2 = (VIDEOINFOHEADER*)mt.ReallocFormatBuffer(sizeof(VIDEOINFOHEADER) + extralen);

                 memcpy(pvih2 + 1, extra, extralen);

                 mts.InsertAt(0, mt);

@@ -932,20 +932,20 @@ HRESULT CRealMediaSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p)
     var = (var << 8) | (*pIn++); \

     var = (var << 8) | (*pIn++);

 

-                GetWORD(packetlen)

+                GetWORD(packetlen);

                 if (packetlen & 0x8000) {

                     m_segments.fMerged = true;

                 }

                 if ((packetlen & 0x4000) == 0) {

-                    GetWORD(packetlen)

+                    GetWORD(packetlen);

                     packetlen &= 0x3fffffff;

                 } else {

                     packetlen &= 0x3fff;

                 }

 

-                GetWORD(packetoffset)

+                GetWORD(packetoffset);

                 if ((packetoffset & 0x4000) == 0) {

-                    GetWORD(packetoffset)

+                    GetWORD(packetoffset);

                     packetoffset &= 0x3fffffff;

                 } else {

                     packetoffset &= 0x3fff;

@@ -1539,17 +1539,17 @@ void CRMFile::GetDimensions()
     var = (var << 8) | (*p++); \

     var = (var << 8) | (*p++);

 

-                    GetWORD(packetlen)

+                    GetWORD(packetlen);

                     if ((packetlen & 0x4000) == 0) {

-                        GetWORD(packetlen)

+                        GetWORD(packetlen);

                         packetlen &= 0x3fffffff;

                     } else {

                         packetlen &= 0x3fff;

                     }

 

-                    GetWORD(packetoffset)

+                    GetWORD(packetoffset);

                     if ((packetoffset & 0x4000) == 0) {

-                        GetWORD(packetoffset)

+                        GetWORD(packetoffset);

                         packetoffset &= 0x3fffffff;

                     } else {

                         packetoffset &= 0x3fff;