diff options
Diffstat (limited to 'src/filters')
6 files changed, 14 insertions, 14 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index 5d4c1f6e7..4dc57ffe9 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -398,7 +398,7 @@ HRESULT CBaseSplitterOutputPin::QueuePacket(CAutoPtr<Packet> p) while (S_OK == m_hrDeliver
&& ((m_queue.GetCount() > (m_QueueMaxPackets*3/2) || m_queue.GetSize() > (MAXPACKETSIZE*3/2))
- || ((m_queue.GetCount() > m_QueueMaxPackets || m_queue.GetSize() > MAXPACKETSIZE) && !(static_cast<CBaseSplitterFilter*>(m_pFilter))->IsAnyPinDrying()))) {
+ || ((m_queue.GetCount() > m_QueueMaxPackets || m_queue.GetSize() > MAXPACKETSIZE) && !(static_cast<CBaseSplitterFilter*>(m_pFilter))->IsAnyPinDrying()))) {
Sleep(10);
}
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp index e56a4cdfe..2e81c0f53 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -1172,22 +1172,22 @@ bool CBaseSplitterFileEx::Read(trhdr& h, bool fSync) __int64 pos = GetPos();
Seek(pos + 188);
if (BitRead(8, true) == 0x47) {
- if(m_tslen != 188) {
+ if (m_tslen != 188) {
count = 0;
}
m_tslen = 188; // TS stream
- if(count > 1) {
+ if (count > 1) {
break;
}
count++;
}
Seek(pos + 192);
if (BitRead(8, true) == 0x47) {
- if(m_tslen != 192) {
+ if (m_tslen != 192) {
count = 0;
}
m_tslen = 192; // M2TS stream
- if(count > 1) {
+ if (count > 1) {
break;
}
count++;
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp index 4e8f6cbf7..362ec1c0b 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2011 see AUTHORS
+ * (C) 2006-2012 see AUTHORS
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -444,7 +444,7 @@ avcsuccess: if (pCueTrackPositions->CueTrack != pTE->TrackNumber) {
continue;
}
-
+
if (lastCueClusterPosition == pCueTrackPositions->CueClusterPosition) {
continue;
}
diff --git a/src/filters/renderer/VideoRenderers/RenderersSettings.cpp b/src/filters/renderer/VideoRenderers/RenderersSettings.cpp index 4721a8286..470359369 100644 --- a/src/filters/renderer/VideoRenderers/RenderersSettings.cpp +++ b/src/filters/renderer/VideoRenderers/RenderersSettings.cpp @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2012 see AUTHORS
*
* This file is part of mplayerc.
*
diff --git a/src/filters/transform/MPCVideoDec/FfmpegContext.c b/src/filters/transform/MPCVideoDec/FfmpegContext.c index 6bf9ab711..d3d3590f5 100644 --- a/src/filters/transform/MPCVideoDec/FfmpegContext.c +++ b/src/filters/transform/MPCVideoDec/FfmpegContext.c @@ -386,7 +386,7 @@ void FFH264UpdateRefFramesList (DXVA_PicParams_H264* pDXVAPicParams, struct AVCo // Short list reference frames
pic = h->short_ref[h->short_ref_count - i - 1];
AssociatedFlag = pic->long_ref != 0;
- } else {
+ } else {
// Long list reference frames
pic = NULL;
while (!pic && j < h->short_ref_count + 16) {
@@ -630,7 +630,7 @@ HRESULT FFMpeg2DecodeFrame (DXVA_PictureParameters* pPicParams, DXVA_QmatrixData if (pBuffer) {
s1->pSliceInfo = pSliceInfo;
-
+
av_init_packet(&avpkt);
avpkt.data = pBuffer;
avpkt.size = nSize;
@@ -646,7 +646,7 @@ HRESULT FFMpeg2DecodeFrame (DXVA_PictureParameters* pPicParams, DXVA_QmatrixData // pPicParams->wDeblockedPictureIndex; 0 for Mpeg2
// pPicParams->wForwardRefPictureIndex; set in DecodeFrame
// pPicParams->wBackwardRefPictureIndex; set in DecodeFrame
-
+
is_field = s->picture_structure != PICT_FRAME;
pPicParams->wPicWidthInMBminus1 = s->mb_width-1;
@@ -716,9 +716,9 @@ HRESULT FFMpeg2DecodeFrame (DXVA_PictureParameters* pPicParams, DXVA_QmatrixData DXVA_SliceInfo *slice = &s1->pSliceInfo[i];
if (i < s1->slice_count - 1) {
- slice->wNumberMBsInSlice = slice[1].wNumberMBsInSlice - slice[0].wNumberMBsInSlice;
+ slice->wNumberMBsInSlice = slice[1].wNumberMBsInSlice - slice[0].wNumberMBsInSlice;
} else {
- slice->wNumberMBsInSlice = mb_count - slice[0].wNumberMBsInSlice;
+ slice->wNumberMBsInSlice = mb_count - slice[0].wNumberMBsInSlice;
}
}
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp index 1934bf317..69fbf5a33 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp @@ -1476,7 +1476,7 @@ HRESULT CMPCVideoDecFilter::EndOfStream() if (HAS_FFMPEG_VIDEO_DECODERS && m_nDXVAMode == MODE_SOFTWARE) {
REFERENCE_TIME rtStart = 0, rtStop = 0;
SoftwareDecode(NULL, NULL, 0, rtStart, rtStop);
- } else if(m_nDXVAMode == MODE_DXVA2) { // TODO - need check under WinXP on DXVA1
+ } else if (m_nDXVAMode == MODE_DXVA2) { // TODO - need check under WinXP on DXVA1
m_pDXVADecoder->EndOfStream();
}
|