diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-30 08:24:01 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-06-01 09:33:19 +0400 |
| commit | 8aae7805d5f464184ca6fd8a38209822fb0ec4da (patch) | |
| tree | 1c0deec6c61b0f6ec6f92064f400a2faf99ef732 /src/filters | |
| parent | 1b83a729f5a8aca67aac24d19d1be0d2757a6b61 (diff) | |
Cosmetics: keep style consistent in multiline macros.
Diffstat (limited to 'src/filters')
5 files changed, 15 insertions, 23 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp index 99f7f3bfb..784e2614c 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -61,11 +61,10 @@ bool CBaseSplitterFileEx::NextMpegStartCode(BYTE& code, __int64 len) //
-#define MARKER \
- if (BitRead(1) != 1) \
- { \
- ASSERT(0); \
- return false; \
+#define MARKER \
+ if (BitRead(1) != 1) { \
+ ASSERT(0); \
+ return false; \
}
bool CBaseSplitterFileEx::Read(pshdr& h)
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp index d1458114b..396d6a449 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp @@ -43,8 +43,7 @@ using namespace MatroskaReader; #define EndChunk \
} \
- } \
- while (pMN->Next()); \
+ } while (pMN->Next()); \
\
return S_OK;
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index baa1357a1..1f301e345 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -1585,12 +1585,11 @@ HRESULT CMpegSplitterOutputPin::DeliverEndFlush() return __super::DeliverEndFlush();
}
-#define MOVE_TO_H264_START_CODE(b, e) \
- while (b <= e-4 && !((*(DWORD *)b == 0x01000000) || ((*(DWORD *)b & 0x00FFFFFF) == 0x00010000))) \
- { \
- b++; \
- } \
- if ((b <= e-4) && *(DWORD *)b == 0x01000000) \
+#define MOVE_TO_H264_START_CODE(b, e) \
+ while (b <= e-4 && !((*(DWORD *)b == 0x01000000) || ((*(DWORD *)b & 0x00FFFFFF) == 0x00010000))) { \
+ b++; \
+ } \
+ if ((b <= e-4) && *(DWORD *)b == 0x01000000) \
b++;
HRESULT CMpegSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p)
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp index 678d9a54a..21f10db03 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp @@ -89,14 +89,12 @@ HRESULT GetPeer(CStreamSwitcherFilter* pFilter, T** ppT) #define CallPeerSeekingAll(call) \
HRESULT hr = E_NOTIMPL; \
POSITION pos = m_pFilter->m_pInputs.GetHeadPosition(); \
- while (pos) \
- { \
+ while (pos) { \
CBasePin* pPin = m_pFilter->m_pInputs.GetNext(pos); \
CComPtr<IPin> pConnected; \
if (FAILED(pPin->ConnectedTo(&pConnected))) \
continue; \
- if (CComQIPtr<IMediaSeeking> pMS = pConnected) \
- { \
+ if (CComQIPtr<IMediaSeeking> pMS = pConnected) { \
HRESULT hr2 = pMS->call; \
if (pPin == m_pFilter->GetInputPin()) \
hr = hr2; \
@@ -107,14 +105,12 @@ HRESULT GetPeer(CStreamSwitcherFilter* pFilter, T** ppT) #define CallPeerAll(call) \
HRESULT hr = E_NOTIMPL; \
POSITION pos = m_pFilter->m_pInputs.GetHeadPosition(); \
- while (pos) \
- { \
+ while (pos) { \
CBasePin* pPin = m_pFilter->m_pInputs.GetNext(pos); \
CComPtr<IPin> pConnected; \
if (FAILED(pPin->ConnectedTo(&pConnected))) \
continue; \
- if (CComQIPtr<IMediaPosition> pMP = pConnected) \
- { \
+ if (CComQIPtr<IMediaPosition> pMP = pConnected) { \
HRESULT hr2 = pMP->call; \
if (pPin == m_pFilter->GetInputPin()) \
hr = hr2; \
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h index e6e09831c..9784bd999 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h @@ -49,8 +49,7 @@ #define CHECK_HR_TRACE(x) \
hr = ##x; \
- if (FAILED(hr)) \
- { \
+ if (FAILED(hr)) { \
TRACE(_T("Error : 0x%08x\n"), hr); \
ASSERT(hr == VFW_E_NOT_COMMITTED); \
return hr; \
|