merge changes from trunk r2365-r2561

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

6 files changed, 14 insertions, 44 deletions

diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.cpp b/src/filters/parser/SSFSplitter/SSFSplitter.cpp
index 0ddbab434..917e35cc0 100644
--- a/src/filters/parser/SSFSplitter/SSFSplitter.cpp
+++ b/src/filters/parser/SSFSplitter/SSFSplitter.cpp
@@ -1,6 +1,6 @@
 /* 

- *	Copyright (C) 2003-2006 Gabest

- *	http://www.gabest.org

+ *  Copyright (C) 2003-2006 Gabest

+ *  http://www.gabest.org

  *

  *  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

@@ -14,7 +14,7 @@
  *   

  *  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

  *

  */

diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.h b/src/filters/parser/SSFSplitter/SSFSplitter.h
index ab03ca8fc..35f95c507 100644
--- a/src/filters/parser/SSFSplitter/SSFSplitter.h
+++ b/src/filters/parser/SSFSplitter/SSFSplitter.h
@@ -1,6 +1,6 @@
 /* 

- *	Copyright (C) 2003-2006 Gabest

- *	http://www.gabest.org

+ *  Copyright (C) 2003-2006 Gabest

+ *  http://www.gabest.org

  *

  *  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

@@ -14,7 +14,7 @@
  *   

  *  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

  *

  */

diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.vcproj b/src/filters/parser/SSFSplitter/SSFSplitter.vcproj
index 98599687c..ae3984aed 100644
--- a/src/filters/parser/SSFSplitter/SSFSplitter.vcproj
+++ b/src/filters/parser/SSFSplitter/SSFSplitter.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1250"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="SSFSplitter"

 	ProjectGUID="{CC07B80F-D44F-41A9-9E37-5F2B47B46EDC}"

 	RootNamespace="SSFSplitter"

@@ -43,7 +43,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 			/>

@@ -100,7 +99,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

@@ -157,7 +155,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 			/>

@@ -214,7 +211,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"

 				EnableEnhancedInstructionSet="0"

@@ -272,7 +268,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

 			/>

@@ -345,7 +340,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

 				DebugInformationFormat="3"

@@ -418,7 +412,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

 			/>

@@ -492,7 +485,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

 				EnableEnhancedInstructionSet="0"

diff --git a/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj b/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj
index 5fd13d633..62ad3772f 100644
--- a/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj
+++ b/src/filters/parser/SSFSplitter/SSFSplitter.vcxproj
@@ -137,7 +137,6 @@
   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

       <AdditionalIncludeDirectories>..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

@@ -150,7 +149,6 @@
       <TargetEnvironment>X64</TargetEnvironment>

     </Midl>

     <ClCompile>

-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

       <AdditionalIncludeDirectories>..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

@@ -161,7 +159,6 @@
   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

       <AdditionalIncludeDirectories>..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>

@@ -175,7 +172,6 @@
       <TargetEnvironment>X64</TargetEnvironment>

     </Midl>

     <ClCompile>

-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

       <AdditionalIncludeDirectories>..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

@@ -186,7 +182,6 @@
   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">

     <ClCompile>

-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

       <AdditionalIncludeDirectories>..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

@@ -208,7 +203,6 @@
       <TargetEnvironment>X64</TargetEnvironment>

     </Midl>

     <ClCompile>

-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

       <AdditionalIncludeDirectories>..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

@@ -228,7 +222,6 @@
   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'">

     <ClCompile>

-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

       <AdditionalIncludeDirectories>..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

@@ -250,7 +243,6 @@
       <TargetEnvironment>X64</TargetEnvironment>

     </Midl>

     <ClCompile>

-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

       <AdditionalIncludeDirectories>..\..\..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

diff --git a/src/filters/parser/SSFSplitter/stdafx.cpp b/src/filters/parser/SSFSplitter/stdafx.cpp
index 924d2f316..13934d005 100644
--- a/src/filters/parser/SSFSplitter/stdafx.cpp
+++ b/src/filters/parser/SSFSplitter/stdafx.cpp
@@ -1,6 +1,6 @@
 /* 

- *	Copyright (C) 2003-2006 Gabest

- *	http://www.gabest.org

+ *  Copyright (C) 2003-2006 Gabest

+ *  http://www.gabest.org

  *

  *  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

@@ -14,16 +14,9 @@
  *   

  *  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

  *

  */

 

-// stdafx.cpp : source file that includes just the standard includes

-// SSFSplitter.pch will be the pre-compiled header

-// stdafx.obj will contain the pre-compiled type information

-

 #include "stdafx.h"

-

-// TODO: reference any additional headers you need in STDAFX.H

-// and not in this file

diff --git a/src/filters/parser/SSFSplitter/stdafx.h b/src/filters/parser/SSFSplitter/stdafx.h
index 043e18b3c..55763f8a3 100644
--- a/src/filters/parser/SSFSplitter/stdafx.h
+++ b/src/filters/parser/SSFSplitter/stdafx.h
@@ -1,6 +1,6 @@
 /* 

- *	Copyright (C) 2003-2006 Gabest

- *	http://www.gabest.org

+ *  Copyright (C) 2003-2006 Gabest

+ *  http://www.gabest.org

  *

  *  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

@@ -14,16 +14,11 @@
  *   

  *  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

  *

  */

 

-// stdafx.h : include file for standard system include files,

-// or project specific include files that are used frequently, but

-// are changed infrequently

-//

-

 #pragma once

 #include "../../../DSUtil/SharedInclude.h"

 

@@ -35,9 +30,7 @@
 #endif

 

 #include <afx.h>

-#include <afxwin.h>         // MFC core and standard components

-

-// TODO: reference additional headers your program requires here

+#include <afxwin.h>			// MFC core and standard components

 

 #include <dshow.h>

 #include <streams.h>