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, 51 deletions

diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
index 7ba78e9f1..99436032b 100644
--- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
+++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.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/transform/BaseVideoFilter/BaseVideoFilter.h b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h
index 9324978bc..37ffdc049 100644
--- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.h
+++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.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/transform/BaseVideoFilter/BaseVideoFilter.vcproj b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.vcproj
index 438b4e5bf..238b6080e 100644
--- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.vcproj
+++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1250"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="BaseVideoFilter"

 	ProjectGUID="{54DDA60F-E528-4D07-A152-960A1E818680}"

 	RootNamespace="BaseVideoFilter"

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

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="WIN32;_DEBUG"

 			/>

@@ -102,7 +101,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="_WIN64;_DEBUG"

 				DebugInformationFormat="3"

@@ -160,7 +158,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="WIN32;NDEBUG"

 			/>

@@ -218,7 +215,6 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="_WIN64;NDEBUG"

 				EnableEnhancedInstructionSet="0"

diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.vcxproj b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.vcxproj
index b1a767204..2a885214a 100644
--- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.vcxproj
+++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.vcxproj
@@ -17,14 +17,6 @@
       <Configuration>Release</Configuration>

       <Platform>x64</Platform>

     </ProjectConfiguration>

-    <ProjectConfiguration Include="Template|Win32">

-      <Configuration>Template</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Template|x64">

-      <Configuration>Template</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{54DDA60F-E528-4D07-A152-960A1E818680}</ProjectGuid>

@@ -44,9 +36,6 @@
     <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>false</WholeProgramOptimization>

   </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">

-    <ConfigurationType>Application</ConfigurationType>

-  </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseOfMfc>Static</UseOfMfc>

@@ -72,9 +61,6 @@
     <Import Project="..\..\..\common.props" />

     <Import Project="..\..\..\debug.props" />

   </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="..\..\..\common.props" />

@@ -91,7 +77,6 @@
   </PropertyGroup>

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

     <ClCompile>

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

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

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

     </ClCompile>

@@ -104,7 +89,6 @@
       <TargetEnvironment>X64</TargetEnvironment>

     </Midl>

     <ClCompile>

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

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

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

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

@@ -115,7 +99,6 @@
   </ItemDefinitionGroup>

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

     <ClCompile>

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

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

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

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

@@ -129,7 +112,6 @@
       <TargetEnvironment>X64</TargetEnvironment>

     </Midl>

     <ClCompile>

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

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

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

       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

diff --git a/src/filters/transform/BaseVideoFilter/stdafx.cpp b/src/filters/transform/BaseVideoFilter/stdafx.cpp
index 4b29d63b8..13934d005 100644
--- a/src/filters/transform/BaseVideoFilter/stdafx.cpp
+++ b/src/filters/transform/BaseVideoFilter/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

-// mpeg2decds.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/transform/BaseVideoFilter/stdafx.h b/src/filters/transform/BaseVideoFilter/stdafx.h
index 8068e9c6e..e0d4538b1 100644
--- a/src/filters/transform/BaseVideoFilter/stdafx.h
+++ b/src/filters/transform/BaseVideoFilter/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,11 +30,8 @@
 #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 <streams.h>

 #include <dvdmedia.h>

 #include <amvideo.h>

-