Filters: applied astyle formatting, updated copyright notice

VSFilter, VSRip: updated copyright notice
Renamed remaining "subtitles" instances to "Subtitles"

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

1 files changed, 14 insertions, 11 deletions

diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.h b/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.h
index 616943d3e..c6b26ede4 100644
--- a/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.h
+++ b/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.h
@@ -1,4 +1,4 @@
-/* 

+/*

  *	Copyright (C) 2003-2006 Gabest

  *	http://www.gabest.org

  *

@@ -6,15 +6,15 @@
  *  it under the terms of the GNU General Public License as published by

  *  the Free Software Foundation; either version 2, or (at your option)

  *  any later version.

- *   

+ *

  *  This Program is distributed in the hope that it will be useful,

  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  *  GNU General Public License for more details.

- *   

+ *

  *  You should have received a copy of the GNU General Public License

  *  along with GNU Make; see the file COPYING.  If not, write to

- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 

+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

  *  http://www.gnu.org/copyleft/gpl.html

  *

  */

@@ -24,7 +24,7 @@
 #include "BitStream.h"

 #include "BaseMuxerInputPin.h"

 #include "BaseMuxerRelatedPin.h"

-#include "../../../subtitles/libssf/SubtitleFile.h"

+#include "../../../Subtitles/libssf/SubtitleFile.h"

 

 class CBaseMuxerOutputPin : public CBaseOutputPin

 {

@@ -38,19 +38,22 @@ public:
 

 	HRESULT BreakConnect();

 

-    HRESULT DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIES* pProperties);

+	HRESULT DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIES* pProperties);

 

-    HRESULT CheckMediaType(const CMediaType* pmt);

-    HRESULT GetMediaType(int iPosition, CMediaType* pmt);

+	HRESULT CheckMediaType(const CMediaType* pmt);

+	HRESULT GetMediaType(int iPosition, CMediaType* pmt);

 

-    HRESULT DeliverEndOfStream();

+	HRESULT DeliverEndOfStream();

 

 	STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);

 };

 

 class CBaseMuxerRawOutputPin : public CBaseMuxerOutputPin, public CBaseMuxerRelatedPin

 {

-	struct idx_t {REFERENCE_TIME rt; __int64 fp;};

+	struct idx_t {

+		REFERENCE_TIME rt;

+		__int64 fp;

+	};

 	CAtlList<idx_t> m_idx;

 

 	ssf::SubtitleFile m_ssf;

@@ -60,7 +63,7 @@ public:
 	virtual ~CBaseMuxerRawOutputPin() {}

 

 	DECLARE_IUNKNOWN;

-    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

 

 	virtual void MuxHeader(const CMediaType& mt);

 	virtual void MuxPacket(const CMediaType& mt, const MuxerPacket* pPacket);