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

11 files changed, 76 insertions, 74 deletions

diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
index ed1e116bd..051712ff5 100644
--- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
+++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
@@ -457,7 +457,7 @@ HRESULT CBaseVideoFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_
 

     pProperties->cBuffers = m_cBuffers;

     pProperties->cbBuffer = bih.biSizeImage;

-    pProperties->cbAlign = 1;

+    pProperties->cbAlign  = 1;

     pProperties->cbPrefix = 0;

 

     HRESULT hr;

@@ -490,14 +490,14 @@ VIDEO_OUTPUT_FORMATS DefaultFormats[] = {
 

 void CBaseVideoFilter::GetOutputFormats(int& nNumber, VIDEO_OUTPUT_FORMATS** ppFormats)

 {

-    nNumber     = _countof(DefaultFormats);

-    *ppFormats  = DefaultFormats;

+    nNumber    = _countof(DefaultFormats);

+    *ppFormats = DefaultFormats;

 }

 

 HRESULT CBaseVideoFilter::GetMediaType(int iPosition, CMediaType* pmt)

 {

-    VIDEO_OUTPUT_FORMATS*   fmts;

-    int                     nFormatCount;

+    VIDEO_OUTPUT_FORMATS* fmts;

+    int nFormatCount;

 

     if (m_pInput->IsConnected() == FALSE) {

         return E_UNEXPECTED;

diff --git a/src/filters/transform/BufferFilter/BufferFilter.cpp b/src/filters/transform/BufferFilter/BufferFilter.cpp
index 20e3dd2af..a40cbc9cc 100644
--- a/src/filters/transform/BufferFilter/BufferFilter.cpp
+++ b/src/filters/transform/BufferFilter/BufferFilter.cpp
@@ -71,7 +71,9 @@ CFilterApp theApp;
 //

 

 CBufferFilter::CBufferFilter(LPUNKNOWN lpunk, HRESULT* phr)

-    : CTransformFilter(NAME("CBufferFilter"), lpunk, __uuidof(this))

+    : CTransformFilter(NAME("CBufferFilter")

+    , lpunk

+    , __uuidof(this))

     , m_nSamplesToBuffer(2)

 {

     HRESULT hr = S_OK;

@@ -223,7 +225,7 @@ HRESULT CBufferFilter::Transform(IMediaSample* pIn, IMediaSample* pOut)
     pIn->GetPointer(&pDataIn);

     pOut->GetPointer(&pDataOut);

 

-    long len = pIn->GetActualDataLength();

+    long len  = pIn->GetActualDataLength();

     long size = pOut->GetSize();

 

     if (!pDataIn || !pDataOut || len > size || len <= 0) {

@@ -353,20 +355,20 @@ HRESULT CBufferFilterOutputPin::Deliver(IMediaSample* pMediaSample)
 

 HRESULT CBufferFilterOutputPin::DeliverEndOfStream()

 {

-    CallQueue(EOS())

+    CallQueue(EOS());

 }

 

 HRESULT CBufferFilterOutputPin::DeliverBeginFlush()

 {

-    CallQueue(BeginFlush())

+    CallQueue(BeginFlush());

 }

 

 HRESULT CBufferFilterOutputPin::DeliverEndFlush()

 {

-    CallQueue(EndFlush())

+    CallQueue(EndFlush());

 }

 

 HRESULT CBufferFilterOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)

 {

-    CallQueue(NewSegment(tStart, tStop, dRate))

+    CallQueue(NewSegment(tStart, tStop, dRate));

 }

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
index 8215fe2f7..840799266 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
@@ -63,8 +63,8 @@ CDXVADecoder::CDXVADecoder(CMPCVideoDecFilter* pFilter, IDirectXVideoDecoder* pD
 

 CDXVADecoder::~CDXVADecoder()

 {

-    SAFE_DELETE_ARRAY(m_pPictureStore)

-    SAFE_DELETE_ARRAY(m_ExecuteParams.pCompressedBuffers)

+    SAFE_DELETE_ARRAY(m_pPictureStore);

+    SAFE_DELETE_ARRAY(m_ExecuteParams.pCompressedBuffers);

 }

 

 void CDXVADecoder::Init(CMPCVideoDecFilter* pFilter, DXVAMode nMode, int nPicEntryNumber)

@@ -311,7 +311,7 @@ HRESULT CDXVADecoder::Execute()
 

     switch (m_nEngine) {

         case ENGINE_DXVA1 :

-            DWORD   dwFunction;

+            DWORD dwFunction;

             HRESULT hr2;

 

             //writeDXVA_QueryOrReplyFunc(&dwFunction, DXVA_QUERYORREPLYFUNCFLAG_DECODER_LOCK_QUERY, DXVA_PICTURE_DECODING_FUNCTION);

@@ -401,15 +401,15 @@ HRESULT CDXVADecoder::FindFreeDXVA1Buffer(DWORD dwTypeIndex, DWORD& dwBufferInde
     int nTry = 0;

 

     dwBufferIndex = 0; //(dwBufferIndex + 1) % m_ComBufferInfo[DXVA_PICTURE_DECODE_BUFFER].dwNumCompBuffers;

-    DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->QueryRenderStatus((DWORD) - 1, dwBufferIndex, 0))

+    DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->QueryRenderStatus((DWORD) - 1, dwBufferIndex, 0));

 

     return hr;

 }

 

 HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliver)

 {

-    HRESULT hr      = E_INVALIDARG;

-    int     nTry    = 0;

+    HRESULT hr = E_INVALIDARG;

+    int nTry = 0;

 

     for (int i = 0; i < 20; i++) {

         switch (m_nEngine) {

@@ -422,7 +422,7 @@ HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliv
                 BeginFrameInfo.dwSizeOutputData = 0;

                 BeginFrameInfo.pOutputData = NULL;

 

-                DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->BeginFrame(&BeginFrameInfo))

+                DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->BeginFrame(&BeginFrameInfo));

 

                 ASSERT(SUCCEEDED(hr));

                 if (SUCCEEDED(hr)) {

@@ -437,7 +437,7 @@ HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliv
                 if (pSampleService) {

                     hr = pSampleService->GetService(MR_BUFFER_SERVICE, __uuidof(IDirect3DSurface9), (void**) &pDecoderRenderTarget);

                     if (SUCCEEDED(hr)) {

-                        DO_DXVA_PENDING_LOOP(m_pDirectXVideoDec->BeginFrame(pDecoderRenderTarget, NULL))

+                        DO_DXVA_PENDING_LOOP(m_pDirectXVideoDec->BeginFrame(pDecoderRenderTarget, NULL));

                     }

                 }

             }

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp
index aaeb541d9..517a3ac4e 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp
@@ -262,31 +262,31 @@ HRESULT CDXVADecoderH264::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME
     //

 */

 

-    CHECK_HR_TRACE(GetFreeSurfaceIndex(nSurfaceIndex, &pSampleToDeliver, rtStart, rtStop))

+    CHECK_HR_TRACE(GetFreeSurfaceIndex(nSurfaceIndex, &pSampleToDeliver, rtStart, rtStop));

     FFH264SetCurrentPicture(nSurfaceIndex, &m_DXVAPicParams, m_pFilter->GetAVCtx());

 

-    CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver))

+    CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver));

 

     m_DXVAPicParams.StatusReportFeedbackNumber++;

 

     // Send picture parameters

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_DXVAPicParams), &m_DXVAPicParams))

-    CHECK_HR_TRACE(Execute())

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_DXVAPicParams), &m_DXVAPicParams));

+    CHECK_HR_TRACE(Execute());

 

     // Add bitstream, slice control and quantization matrix

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize, pDataIn, &nSize))

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize, pDataIn, &nSize));

 

     if (m_bUseLongSlice) {

-        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_Slice_H264_Long)*nSlices, m_pSliceLong))

+        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_Slice_H264_Long)*nSlices, m_pSliceLong));

     } else {

-        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_Slice_H264_Short)*nSlices, m_pSliceShort))

+        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_Slice_H264_Short)*nSlices, m_pSliceShort));

     }

 

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_InverseQuantizationMatrixBufferType, sizeof(DXVA_Qmatrix_H264), (void*)&m_DXVAScalingMatrix))

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_InverseQuantizationMatrixBufferType, sizeof(DXVA_Qmatrix_H264), (void*)&m_DXVAScalingMatrix));

 

     // Decode bitstream

-    CHECK_HR_TRACE(Execute())

-    CHECK_HR_TRACE(EndFrame(nSurfaceIndex))

+    CHECK_HR_TRACE(Execute());

+    CHECK_HR_TRACE(EndFrame(nSurfaceIndex));

 

 #if defined(_DEBUG) && 0

     DisplayStatus();

@@ -361,7 +361,7 @@ HRESULT CDXVADecoderH264::DisplayStatus()
     DXVA_Status_H264 Status;

 

     memset(&Status, 0, sizeof(Status));

-    CHECK_HR_TRACE(hr = CDXVADecoder::QueryStatus(&Status, sizeof(Status)))

+    CHECK_HR_TRACE(hr = CDXVADecoder::QueryStatus(&Status, sizeof(Status)));

 

     TRACE_H264("CDXVADecoderH264::DisplayStatus() : Status for the frame %u : bBufType = %u, bStatus = %u, wNumMbsAffected = %u\n",

                Status.StatusReportFeedbackNumber,

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp
index 8ff382652..14ee6ac72 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp
@@ -115,7 +115,7 @@ HRESULT CDXVADecoderMpeg2::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME
         return S_FALSE;

     }

 

-    CHECK_HR_TRACE(BeginFrame(m_nSurfaceIndex, m_pSampleToDeliver))

+    CHECK_HR_TRACE(BeginFrame(m_nSurfaceIndex, m_pSampleToDeliver));

 

     if (m_bSecondField) {

         if (!m_PictureParams.bSecondField) {

@@ -128,16 +128,16 @@ HRESULT CDXVADecoderMpeg2::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME
     TRACE_MPEG2("CDXVADecoderMpeg2::DecodeFrame() : Surf = %d, PictureType = %d, SecondField = %d, m_nNextCodecIndex = %d, rtStart = [%I64d]\n",

                 m_nSurfaceIndex, nSliceType, m_PictureParams.bSecondField, m_nNextCodecIndex, rtStart);

 

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams))

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_InverseQuantizationMatrixBufferType, sizeof(m_QMatrixData), &m_QMatrixData))

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams));

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_InverseQuantizationMatrixBufferType, sizeof(m_QMatrixData), &m_QMatrixData));

 

     // Send bitstream to accelerator

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_SliceInfo)*m_nSliceCount, &m_SliceInfo))

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize, pDataIn, &nSize))

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_SliceInfo)*m_nSliceCount, &m_SliceInfo));

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize, pDataIn, &nSize));

 

     // Decode frame

-    CHECK_HR_TRACE(Execute())

-    CHECK_HR_TRACE(EndFrame(m_nSurfaceIndex))

+    CHECK_HR_TRACE(Execute());

+    CHECK_HR_TRACE(EndFrame(m_nSurfaceIndex));

 

     if (m_bSecondField) {

         if (m_PictureParams.bSecondField) {

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp
index 6f05f4033..fce7f5cda 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp
@@ -35,7 +35,7 @@
 

 inline void SwapRT(REFERENCE_TIME& rtFirst, REFERENCE_TIME& rtSecond)

 {

-    REFERENCE_TIME  rtTemp = rtFirst;

+    REFERENCE_TIME rtTemp = rtFirst;

     rtFirst = rtSecond;

     rtSecond = rtTemp;

 }

@@ -103,7 +103,7 @@ HRESULT CDXVADecoderVC1::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME r
         return hr;

     }

 

-    CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver))

+    CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver));

 

     TRACE_VC1("CDXVADecoderVC1::DecodeFrame() : PictureType = %d, rtStart = %I64d, Surf = %d\n", nSliceType, rtStart, nSurfaceIndex);

 

@@ -129,39 +129,39 @@ HRESULT CDXVADecoderVC1::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME r
     TRACE_VC1("CDXVADecoderVC1::DecodeFrame() : Decode frame %i\n", m_PictureParams.bPicScanMethod);

 

     // Send picture params to accelerator

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams))

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams));

 

     // Send bitstream to accelerator

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nFrameSize ? nFrameSize : nSize, pDataIn, &nSize_Result))

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nFrameSize ? nFrameSize : nSize, pDataIn, &nSize_Result));

 

     m_SliceInfo.wQuantizerScaleCode = 1;    // TODO : 1->31 ???

     m_SliceInfo.dwSliceBitsInBuffer = nSize_Result * 8;

-    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(m_SliceInfo), &m_SliceInfo))

+    CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(m_SliceInfo), &m_SliceInfo));

 

     // Decode frame

-    CHECK_HR_TRACE(Execute())

-    CHECK_HR_TRACE(EndFrame(nSurfaceIndex))

+    CHECK_HR_TRACE(Execute());

+    CHECK_HR_TRACE(EndFrame(nSurfaceIndex));

 

     // ***************

     if (nFrameSize) { // Decoding Second Field

         FFVC1UpdatePictureParam(&m_PictureParams, m_pFilter->GetAVCtx(), NULL, NULL, pDataIn, nSize, NULL, TRUE, &m_bFrame_repeat_pict);

 

-        CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver))

+        CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver));

 

         TRACE_VC1("CDXVADecoderVC1::DecodeFrame() : PictureType = %d\n", nSliceType);

 

-        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams))

+        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams));

 

         // Send bitstream to accelerator

-        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize - nFrameSize, pDataIn + nFrameSize, &nSize_Result))

+        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize - nFrameSize, pDataIn + nFrameSize, &nSize_Result));

 

         m_SliceInfo.wQuantizerScaleCode = 1;        // TODO : 1->31 ???

         m_SliceInfo.dwSliceBitsInBuffer = nSize_Result * 8;

-        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(m_SliceInfo), &m_SliceInfo))

+        CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(m_SliceInfo), &m_SliceInfo));

 

         // Decode frame

-        CHECK_HR_TRACE(Execute())

-        CHECK_HR_TRACE(EndFrame(nSurfaceIndex))

+        CHECK_HR_TRACE(Execute());

+        CHECK_HR_TRACE(EndFrame(nSurfaceIndex));

     }

     // ***************

 

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
index 722dc8de0..1f44e731d 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
@@ -714,7 +714,7 @@ void CMPCVideoDecFilter::DetectVideoCard(HWND hWnd)
 CMPCVideoDecFilter::~CMPCVideoDecFilter()

 {

     Cleanup();

-    SAFE_DELETE(m_pCpuId)

+    SAFE_DELETE(m_pCpuId);

 }

 

 bool CMPCVideoDecFilter::IsVideoInterlaced()

@@ -930,7 +930,7 @@ int CMPCVideoDecFilter::FindCodec(const CMediaType* mtIn)
 

 void CMPCVideoDecFilter::Cleanup()

 {

-    SAFE_DELETE(m_pDXVADecoder)

+    SAFE_DELETE(m_pDXVADecoder);

 

     // Release FFMpeg

     if (m_pAVCtx) {

@@ -976,7 +976,7 @@ void CMPCVideoDecFilter::Cleanup()
     m_nFFPicEnd     = INT_MIN;

     m_nCodecNb      = -1;

     m_nCodecId      = CODEC_ID_NONE;

-    SAFE_DELETE_ARRAY(m_pVideoOutputFormat)

+    SAFE_DELETE_ARRAY(m_pVideoOutputFormat);

 

     // Release DXVA ressources

     if (m_hDevice != INVALID_HANDLE_VALUE) {

@@ -1080,7 +1080,7 @@ CString CMPCVideoDecFilter::GetFileExtension()
             break;

         }

     }

-    EndEnumFilters

+    EndEnumFilters;

 

     return ext;

 }

@@ -1293,7 +1293,7 @@ bool CMPCVideoDecFilter::IsDXVASupported()
 

 void CMPCVideoDecFilter::BuildDXVAOutputFormat()

 {

-    SAFE_DELETE_ARRAY(m_pVideoOutputFormat)

+    SAFE_DELETE_ARRAY(m_pVideoOutputFormat);

 

     m_nVideoOutputCount = IsDXVASupported() ? ffCodecs[m_nCodecNb].DXVAModeCount() + _countof(DXVAFormats) : 0;

     if (m_bUseFFmpeg) {

@@ -1871,7 +1871,7 @@ HRESULT CMPCVideoDecFilter::SoftwareDecode(IMediaSample* pIn, BYTE* pDataIn, int
         }

 

 #if defined(_DEBUG) && 0

-        static REFERENCE_TIME   rtLast = 0;

+        static REFERENCE_TIME rtLast = 0;

         TRACE("Deliver : %10I64d - %10I64d   (%10I64d)  {%10I64d}\n", rtStart, rtStop,

               rtStop - rtStart, rtStart - rtLast);

         rtLast = rtStart;

@@ -2388,12 +2388,12 @@ HRESULT CMPCVideoDecFilter::FindDXVA1DecoderConfiguration(IAMVideoAccelerator* p
             for (DWORD iFormat = 0; iFormat < dwFormats; iFormat++) {

                 if (pPixelFormats[iFormat].dwFourCC == MAKEFOURCC('N', 'V', '1', '2')) {

                     memcpy(pPixelFormat, &pPixelFormats[iFormat], sizeof(DDPIXELFORMAT));

-                    SAFE_DELETE_ARRAY(pPixelFormats)

+                    SAFE_DELETE_ARRAY(pPixelFormats);

                     return S_OK;

                 }

             }

 

-            SAFE_DELETE_ARRAY(pPixelFormats)

+            SAFE_DELETE_ARRAY(pPixelFormats);

             hr = E_FAIL;

         }

     }

@@ -2436,7 +2436,7 @@ HRESULT CMPCVideoDecFilter::CreateDXVA1Decoder(IAMVideoAccelerator*  pAMVideoAcc
     if (m_pDXVADecoder && m_DXVADecoderGUID == *pDecoderGuid) {

         return S_OK;

     }

-    SAFE_DELETE(m_pDXVADecoder)

+    SAFE_DELETE(m_pDXVADecoder);

 

     if (!m_bUseDXVA) {

         return E_FAIL;

diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp
index f4626bf2c..fae6a818e 100644
--- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp
+++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp
@@ -2103,7 +2103,7 @@ HRESULT CMpaDecFilter::DeliverFFmpeg(enum CodecID nCodecId, BYTE* p, int buffsiz
     }

     //

     else {

-        COPY_TO_BUFFER(p, buffsize)

+        COPY_TO_BUFFER(p, buffsize);

         pDataBuff = m_pFFBuffer;

     }

 

@@ -2179,7 +2179,7 @@ HRESULT CMpaDecFilter::DeliverFFmpeg(enum CodecID nCodecId, BYTE* p, int buffsiz
                 }

 

                 CAtlArray<float> pBuffOut;

-                float*           pDataOut;

+                float* pDataOut;

 

                 pBuffOut.SetCount(nSamples);

                 pDataOut = pBuffOut.GetData();

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
index 6495b7001..a5a9d1ad0 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
@@ -1557,22 +1557,22 @@ HRESULT CMpeg2DecOutputPin::Deliver(IMediaSample* pMediaSample)
 

 HRESULT CMpeg2DecOutputPin::DeliverEndOfStream()

 {

-    CallQueue(EOS())

+    CallQueue(EOS());

 }

 

 HRESULT CMpeg2DecOutputPin::DeliverBeginFlush()

 {

-    CallQueue(BeginFlush())

+    CallQueue(BeginFlush());

 }

 

 HRESULT CMpeg2DecOutputPin::DeliverEndFlush()

 {

-    CallQueue(EndFlush())

+    CallQueue(EndFlush());

 }

 

 HRESULT CMpeg2DecOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)

 {

-    CallQueue(NewSegment(tStart, tStop, dRate))

+    CallQueue(NewSegment(tStart, tStop, dRate));

 }

 

 

diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
index 1f0135169..16b9cf60c 100644
--- a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
+++ b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp
@@ -1192,7 +1192,7 @@ HRESULT CDirectVobSubFilter2::JoinFilterGraph(IFilterGraph* pGraph, LPCWSTR pNam
                 return E_FAIL;

             }

         }

-        EndEnumFilters

+        EndEnumFilters;

 

         // don't look... we will do some serious graph hacking again...

         //

@@ -1273,7 +1273,7 @@ HRESULT CDirectVobSubFilter2::JoinFilterGraph(IFilterGraph* pGraph, LPCWSTR pNam
                     break;

                 }

             }

-            EndEnumFilters

+            EndEnumFilters;

         }

     } else {

     }

@@ -1356,12 +1356,12 @@ bool CDirectVobSubFilter2::ShouldWeAutoload(IFilterGraph* pGraph)
                         break;

                     }

                 }

-                EndEnumMediaTypes(pmt)

+                EndEnumMediaTypes(pmt);

                 if (fRet) {

                     break;

                 }

             }

-            EndEnumFilters

+            EndEnumFilters;

         }

     }

 

@@ -1380,7 +1380,7 @@ bool CDirectVobSubFilter2::ShouldWeAutoload(IFilterGraph* pGraph)
             break;

         }

     }

-    EndEnumFilters

+    EndEnumFilters;

 

     if ((m_fExternalLoad || m_fWebLoad) && (m_fWebLoad || !(wcsstr(fn, L"http://") || wcsstr(fn, L"mms://")))) {

         bool fTemp = m_fHideSubtitles;

@@ -1409,7 +1409,7 @@ void CDirectVobSubFilter2::GetRidOfInternalScriptRenderer()
                 m_pGraph->ConnectDirect(pPinTo, GetPin(2 + m_pTextInput.GetCount() - 1), NULL);

             }

         }

-        EndEnumPins

+        EndEnumPins;

 

         if (FAILED(m_pGraph->RemoveFilter(pBF))) {

             break;

diff --git a/src/filters/transform/VSFilter/Systray.cpp b/src/filters/transform/VSFilter/Systray.cpp
index a4aeb6e5b..3b86b5db1 100644
--- a/src/filters/transform/VSFilter/Systray.cpp
+++ b/src/filters/transform/VSFilter/Systray.cpp
@@ -213,7 +213,7 @@ LRESULT CSystrayWindow::OnNotifyIcon(WPARAM wParam, LPARAM lParam)
 

                 break;

             }

-            EndEnumFilters

+            EndEnumFilters;

 

             if (pBF2) {

                 ShowPPage(pBF2, hWnd);

@@ -239,7 +239,7 @@ LRESULT CSystrayWindow::OnNotifyIcon(WPARAM wParam, LPARAM lParam)
                     names.Add(name);

                 }

             }

-            EndEnumFilters

+            EndEnumFilters;

 

             CMenu popup;

             popup.CreatePopupMenu();

@@ -370,7 +370,7 @@ static TCHAR* CallPPage(IFilterGraph* pGraph, int idx, HWND hWnd)
 

         i++;

     }

-    EndEnumFilters

+    EndEnumFilters;

 

     TCHAR* ret = NULL;