remove duplicate defines and remove trailing ";"

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

1 files changed, 5 insertions, 10 deletions

diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
index bad4f4bd9..cbc68add6 100644
--- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
+++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp
@@ -1555,29 +1555,24 @@ HRESULT CMpeg2DecOutputPin::Deliver(IMediaSample* pMediaSample)
     return m_pOutputQueue->Receive(pMediaSample);

 }

 

-#define CallQueue(call)                  \

-    if (!m_pOutputQueue) return NOERROR; \

-    m_pOutputQueue->##call;              \

-    return NOERROR;

-

 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))

 }

 

 

@@ -1968,7 +1963,7 @@ bool CSubpicInputPin::dvdspu::Parse()
 

     int i, next = datasize;

 

-#define GetWORD (p[i]<<8)|p[i+1]; i += 2

+#define GetWORD (p[i] << 8) | p[i+1]; i += 2

 

     do {

         i = next;