69 files changed, 29 insertions, 41 deletions

diff --git a/filters.sln b/filters.sln
index 645722f2f..2e48fd939 100644
--- a/filters.sln
+++ b/filters.sln
@@ -206,7 +206,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RoQSplitter", "src\filters\
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "src\zlib\zlib.vcproj", "{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "src\thirdparty\zlib\zlib.vcproj", "{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OggSplitter", "src\filters\parser\oggsplitter\OggSplitter.vcproj", "{7FE0A205-3F39-4AC3-BC3C-C2D9E4D02475}"

 	ProjectSection(ProjectDependencies) = postProject

diff --git a/mpc-hc.sln b/mpc-hc.sln
index 5b80bbf83..f21691122 100644
--- a/mpc-hc.sln
+++ b/mpc-hc.sln
@@ -176,7 +176,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RoQSplitter", "src\filters\
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "src\zlib\zlib.vcproj", "{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "src\thirdparty\zlib\zlib.vcproj", "{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OggSplitter", "src\filters\parser\OggSplitter\OggSplitter.vcproj", "{7FE0A205-3F39-4AC3-BC3C-C2D9E4D02475}"

 	ProjectSection(ProjectDependencies) = postProject

@@ -306,7 +306,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sizecbar", "src\ui\sizecbar
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TreePropSheet", "src\ui\TreePropSheet\TreePropSheet.vcproj", "{AB494732-EF6D-44D0-BCF8-80FF04858D10}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "src\libpng\libpng.vcproj", "{FC8080D1-603C-45EC-BCFA-7172E2F3D989}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "src\thirdparty\libpng\libpng.vcproj", "{FC8080D1-603C-45EC-BCFA-7172E2F3D989}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssf", "src\subtitles\libssf\libssf.vcproj", "{DD9D2D92-2241-408A-859E-B85D444B7E3C}"

 EndProject

diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp
index 3786e6908..d36e9e44b 100644
--- a/src/apps/mplayerc/MainFrm.cpp
+++ b/src/apps/mplayerc/MainFrm.cpp
@@ -4584,7 +4584,7 @@ bool CMainFrame::GetDIB(BYTE** ppData, long& size, bool fSilent)
 }

 

 #include "jpeg.h"

-#include "pngdib.h"

+#include "../../thirdparty/pngdib/pngdib.h"

 

 void CMainFrame::SaveDIB(LPCTSTR fn, BYTE* pData, long size)

 {

diff --git a/src/apps/mplayerc/libpng.c b/src/apps/mplayerc/libpng.c
index 3c7b64360..33bbebfc8 100644
--- a/src/apps/mplayerc/libpng.c
+++ b/src/apps/mplayerc/libpng.c
@@ -24,7 +24,7 @@
 #include <stdio.h>

 #include <malloc.h>

 #include "libpng.h"

-#include "../../libpng/png.h"

+#include "../../thirdparty/libpng/png.h"

 

 

 static void read_data_fn(png_structp png_ptr, png_bytep data, png_size_t length)

diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj
index 87e6a3271..c91d224c3 100644
--- a/src/apps/mplayerc/mplayerc.vcproj
+++ b/src/apps/mplayerc/mplayerc.vcproj
@@ -53,7 +53,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\zlib;..\..\filters\renderer\VideoRenderers;&quot;$(DXSDK_DIR)Include&quot;"

+				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty\zlib;..\..\filters\renderer\VideoRenderers;&quot;$(DXSDK_DIR)Include&quot;"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;DETOURS_X32"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

@@ -143,7 +143,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\zlib;..\..\filters\renderer\VideoRenderers;&quot;$(DXSDK_DIR)Include&quot;"

+				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty\zlib;..\..\filters\renderer\VideoRenderers;&quot;$(DXSDK_DIR)Include&quot;"

 				PreprocessorDefinitions="_WIN64;NDEBUG;_WINDOWS;DETOURS_X64"

 				EnableEnhancedInstructionSet="0"

 				UsePrecompiledHeader="2"

@@ -232,7 +232,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\zlib;..\..\filters\renderer\VideoRenderers;&quot;$(DXSDK_DIR)Include&quot;"

+				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty\zlib;..\..\filters\renderer\VideoRenderers;&quot;$(DXSDK_DIR)Include&quot;"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DETOURS_X32"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

@@ -317,7 +317,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\zlib;..\..\filters\renderer\VideoRenderers;&quot;$(DXSDK_DIR)Include&quot;"

+				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\dx;..\..\..\include\atl;..\..\filters\BaseClasses;..\..\thirdparty\zlib;..\..\filters\renderer\VideoRenderers;&quot;$(DXSDK_DIR)Include&quot;"

 				PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS;DETOURS_X64"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="stdafx.h"

@@ -634,7 +634,7 @@
 				>

 			</File>

 			<File

-				RelativePath=".\pngdib.c"

+				RelativePath="..\..\thirdparty\pngdib\pngdib.c"

 				>

 				<FileConfiguration

 					Name="Release|Win32"

diff --git a/src/apps/mplayerc/stdafx.h b/src/apps/mplayerc/stdafx.h
index 2e06958f9..6304ad76d 100644
--- a/src/apps/mplayerc/stdafx.h
+++ b/src/apps/mplayerc/stdafx.h
@@ -63,7 +63,7 @@
 #include <atlcoll.h>

 #include <atlpath.h>

 

-#include "../../zlib/zlib.h"

+#include "../../thirdparty/zlib/zlib.h"

 

 #include <streams.h>

 #include <dvdmedia.h>

diff --git a/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj b/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj
index b2bbab128..341ffbbaf 100644
--- a/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj
+++ b/src/filters/muxer/DSMMuxer/DSMMuxer.vcproj
@@ -276,7 +276,6 @@
 				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

-				UsePrecompiledHeader="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -350,7 +349,6 @@
 				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

-				UsePrecompiledHeader="0"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.vcproj b/src/filters/parser/DSMSplitter/DSMSplitter.vcproj
index 529d48bb2..753d29ecb 100644
--- a/src/filters/parser/DSMSplitter/DSMSplitter.vcproj
+++ b/src/filters/parser/DSMSplitter/DSMSplitter.vcproj
@@ -276,7 +276,6 @@
 				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

-				UsePrecompiledHeader="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -351,7 +350,6 @@
 				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

-				UsePrecompiledHeader="0"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MoovAtom.cpp b/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MoovAtom.cpp
index 6a04d3ffc..2697ab4e0 100644
--- a/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MoovAtom.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Source/Core/Ap4MoovAtom.cpp
@@ -36,7 +36,7 @@
 // ==> Start patch MPC
 #include "AP4DcomAtom.h"
 #include "AP4CmvdAtom.h"
-#include "../../../../../../zlib/zlib.h"
+#include "../../../../../../thirdparty/zlib/zlib.h"
 // <== End patch MPC
 
 /*----------------------------------------------------------------------
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
index 620b2cc2a..1bbe406f1 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp
@@ -22,7 +22,7 @@
 #include "stdafx.h"

 #include "MatroskaFile.h"

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

-#include "../../../zlib/zlib.h"

+#include "../../../thirdparty/zlib/zlib.h"

 

 #define DOCTYPE _T("matroska")

 #define DOCTYPEVERSION 2

diff --git a/src/filters/parser/RoQSplitter/RoQSplitter.vcproj b/src/filters/parser/RoQSplitter/RoQSplitter.vcproj
index 67e4af626..82bc2e96f 100644
--- a/src/filters/parser/RoQSplitter/RoQSplitter.vcproj
+++ b/src/filters/parser/RoQSplitter/RoQSplitter.vcproj
@@ -276,7 +276,6 @@
 				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

-				UsePrecompiledHeader="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -350,7 +349,6 @@
 				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;_DEBUG;_USRDLL"

-				UsePrecompiledHeader="0"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -424,7 +422,6 @@
 				AdditionalOptions="/MP"

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

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

-				UsePrecompiledHeader="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -500,7 +497,6 @@
 				AdditionalIncludeDirectories="..\..\..\..\include;..\..\BaseClasses"

 				PreprocessorDefinitions="REGISTER_FILTER;WIN32;NDEBUG;_USRDLL"

 				EnableEnhancedInstructionSet="0"

-				UsePrecompiledHeader="0"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/Makefile b/src/filters/transform/MPCVideoDec/ffmpeg/Makefile
index f35a8d454..cf2c12c37 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/Makefile
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/Makefile
@@ -1,8 +1,8 @@
 LAVC_DIR=libavcodec

 LAVU_DIR=libavutil

 LSWS_DIR=libswscale

-PNG_DIR=../../../../libpng

-ZLIB_DIR=../../../../zlib

+PNG_DIR=../../../../thirdparty/libpng

+ZLIB_DIR=../../../../thirdparty/zlib

 

 ifeq ($(64BIT),yes)

 	OUT_DIR=../../../../../bin/obj/Release_x64/libavcodec_gcc/

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/gccbuild64.bat b/src/filters/transform/MPCVideoDec/ffmpeg/gccbuild64.bat
index 594821653..be7fe82c0 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/gccbuild64.bat
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/gccbuild64.bat
@@ -5,7 +5,7 @@ exit 1005
 

 :Var1Ok

 set CC=gcc.exe

-set PATH=%MSYS%\bin;%YASM%;%MINGW64%\bin;%PATH%

+set PATH=%MSYS%\bin;%MINGW64%\bin;%YASM%;%PATH%

 

 IF "%1%"=="rebuild" goto DoClean

 IF "%1%"=="clean" goto OnlyClean

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj
index 99a14a641..4388a4c16 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec.vcproj
@@ -51,7 +51,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"

+				AdditionalIncludeDirectories="..\..\..\..\thirdparty\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"

 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;HAVE_AV_CONFIG_H;H264_MERGE_TESTING"

 				ExceptionHandling="0"

 				OpenMP="false"

@@ -60,7 +60,6 @@
 				ProgramDataBaseFileName="$(IntDir)\"

 				BrowseInformation="0"

 				WarningLevel="0"

-				SuppressStartupBanner="true"

 				DebugInformationFormat="4"

 				CompileAs="0"

 				DisableSpecificWarnings="4996"

@@ -127,7 +126,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\..\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"

+				AdditionalIncludeDirectories="..\..\..\..\thirdparty\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"

 				PreprocessorDefinitions="_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;HAVE_AV_CONFIG_H"

 				ExceptionHandling="0"

 				AssemblerListingLocation="$(IntDir)\"

@@ -135,7 +134,6 @@
 				ProgramDataBaseFileName="$(IntDir)\"

 				BrowseInformation="0"

 				WarningLevel="0"

-				SuppressStartupBanner="true"

 				DebugInformationFormat="3"

 				CompileAs="0"

 				DisableSpecificWarnings="4996"

@@ -208,7 +206,7 @@
 				OmitFramePointers="true"

 				EnableFiberSafeOptimizations="true"

 				WholeProgramOptimization="false"

-				AdditionalIncludeDirectories="..\..\..\..\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"

+				AdditionalIncludeDirectories="..\..\..\..\thirdparty\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"

 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"

 				ExceptionHandling="0"

 				FloatingPointModel="2"

@@ -219,7 +217,6 @@
 				ProgramDataBaseFileName="$(IntDir)\"

 				BrowseInformation="0"

 				WarningLevel="1"

-				SuppressStartupBanner="true"

 				CompileAs="0"

 				DisableSpecificWarnings="4996,4005,4002,4244"

 			/>

@@ -291,7 +288,7 @@
 				FavorSizeOrSpeed="1"

 				OmitFramePointers="true"

 				WholeProgramOptimization="false"

-				AdditionalIncludeDirectories="..\..\..\..\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"

+				AdditionalIncludeDirectories="..\..\..\..\thirdparty\zlib;.;libavcodec;libavutil;libswscale;..\..\..\..\..\include"

 				PreprocessorDefinitions="_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"

 				ExceptionHandling="0"

 				EnableEnhancedInstructionSet="0"

@@ -300,7 +297,6 @@
 				ProgramDataBaseFileName="$(IntDir)\"

 				BrowseInformation="0"

 				WarningLevel="1"

-				SuppressStartupBanner="true"

 				CompileAs="1"

 				DisableSpecificWarnings="4996,4005,4002,4244"

 			/>

diff --git a/src/libpng/CHANGES b/src/thirdparty/libpng/CHANGES
index 0feb78c6d..0feb78c6d 100644
--- a/src/libpng/CHANGES
+++ b/src/thirdparty/libpng/CHANGES
diff --git a/src/libpng/LICENSE b/src/thirdparty/libpng/LICENSE
index e5eadd78f..e5eadd78f 100644
--- a/src/libpng/LICENSE
+++ b/src/thirdparty/libpng/LICENSE
diff --git a/src/libpng/README b/src/thirdparty/libpng/README
index 730597d3c..730597d3c 100644
--- a/src/libpng/README
+++ b/src/thirdparty/libpng/README
diff --git a/src/libpng/libpng.vcproj b/src/thirdparty/libpng/libpng.vcproj
index b84392650..68a35b0da 100644
--- a/src/libpng/libpng.vcproj
+++ b/src/thirdparty/libpng/libpng.vcproj
@@ -22,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\debug.vsprops;..\common.vsprops"

+			InheritedPropertySheets="..\..\debug.vsprops;..\..\common.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			WholeProgramOptimization="0"

@@ -81,7 +81,7 @@
 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\debug.vsprops;..\common.vsprops"

+			InheritedPropertySheets="..\..\debug.vsprops;..\..\common.vsprops"

 			CharacterSet="1"

 			WholeProgramOptimization="0"

 			>

@@ -141,7 +141,7 @@
 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\release.vsprops;..\common.vsprops"

+			InheritedPropertySheets="..\..\release.vsprops;..\..\common.vsprops"

 			UseOfMFC="1"

 			CharacterSet="1"

 			WholeProgramOptimization="0"

@@ -199,7 +199,7 @@
 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\release.vsprops;..\common.vsprops"

+			InheritedPropertySheets="..\..\release.vsprops;..\..\common.vsprops"

 			CharacterSet="1"

 			WholeProgramOptimization="0"

 			>

diff --git a/src/libpng/png.c b/src/thirdparty/libpng/png.c
index 39fa6b802..39fa6b802 100644
--- a/src/libpng/png.c
+++ b/src/thirdparty/libpng/png.c
diff --git a/src/libpng/png.h b/src/thirdparty/libpng/png.h
index d556dc654..d556dc654 100644
--- a/src/libpng/png.h
+++ b/src/thirdparty/libpng/png.h
diff --git a/src/libpng/pngconf.h b/src/thirdparty/libpng/pngconf.h
index dbef5d265..dbef5d265 100644
--- a/src/libpng/pngconf.h
+++ b/src/thirdparty/libpng/pngconf.h
diff --git a/src/libpng/pngerror.c b/src/thirdparty/libpng/pngerror.c
index bb02b2763..bb02b2763 100644
--- a/src/libpng/pngerror.c
+++ b/src/thirdparty/libpng/pngerror.c
diff --git a/src/libpng/pngget.c b/src/thirdparty/libpng/pngget.c
index 2a43a4d4e..2a43a4d4e 100644
--- a/src/libpng/pngget.c
+++ b/src/thirdparty/libpng/pngget.c
diff --git a/src/libpng/pngmem.c b/src/thirdparty/libpng/pngmem.c
index a7a79ab1a..a7a79ab1a 100644
--- a/src/libpng/pngmem.c
+++ b/src/thirdparty/libpng/pngmem.c
diff --git a/src/libpng/pngpread.c b/src/thirdparty/libpng/pngpread.c
index 6a8ad93d9..6a8ad93d9 100644
--- a/src/libpng/pngpread.c
+++ b/src/thirdparty/libpng/pngpread.c
diff --git a/src/libpng/pngpriv.h b/src/thirdparty/libpng/pngpriv.h
index a15fdd815..a15fdd815 100644
--- a/src/libpng/pngpriv.h
+++ b/src/thirdparty/libpng/pngpriv.h
diff --git a/src/libpng/pngread.c b/src/thirdparty/libpng/pngread.c
index 3ec2df4d1..3ec2df4d1 100644
--- a/src/libpng/pngread.c
+++ b/src/thirdparty/libpng/pngread.c
diff --git a/src/libpng/pngrio.c b/src/thirdparty/libpng/pngrio.c
index 990fe3f5a..990fe3f5a 100644
--- a/src/libpng/pngrio.c
+++ b/src/thirdparty/libpng/pngrio.c
diff --git a/src/libpng/pngrtran.c b/src/thirdparty/libpng/pngrtran.c
index 63ac38b8b..63ac38b8b 100644
--- a/src/libpng/pngrtran.c
+++ b/src/thirdparty/libpng/pngrtran.c
diff --git a/src/libpng/pngrutil.c b/src/thirdparty/libpng/pngrutil.c
index aa70927a9..aa70927a9 100644
--- a/src/libpng/pngrutil.c
+++ b/src/thirdparty/libpng/pngrutil.c
diff --git a/src/libpng/pngset.c b/src/thirdparty/libpng/pngset.c
index 90ef1b4cf..90ef1b4cf 100644
--- a/src/libpng/pngset.c
+++ b/src/thirdparty/libpng/pngset.c
diff --git a/src/libpng/pngtest.c b/src/thirdparty/libpng/pngtest.c
index ca164198f..ca164198f 100644
--- a/src/libpng/pngtest.c
+++ b/src/thirdparty/libpng/pngtest.c
diff --git a/src/libpng/pngtrans.c b/src/thirdparty/libpng/pngtrans.c
index d604a7a47..d604a7a47 100644
--- a/src/libpng/pngtrans.c
+++ b/src/thirdparty/libpng/pngtrans.c
diff --git a/src/libpng/pngwio.c b/src/thirdparty/libpng/pngwio.c
index d7b42fd94..d7b42fd94 100644
--- a/src/libpng/pngwio.c
+++ b/src/thirdparty/libpng/pngwio.c
diff --git a/src/libpng/pngwrite.c b/src/thirdparty/libpng/pngwrite.c
index 75bfe18d9..75bfe18d9 100644
--- a/src/libpng/pngwrite.c
+++ b/src/thirdparty/libpng/pngwrite.c
diff --git a/src/libpng/pngwtran.c b/src/thirdparty/libpng/pngwtran.c
index 9cf095b8c..9cf095b8c 100644
--- a/src/libpng/pngwtran.c
+++ b/src/thirdparty/libpng/pngwtran.c
diff --git a/src/libpng/pngwutil.c b/src/thirdparty/libpng/pngwutil.c
index b75c34bfd..b75c34bfd 100644
--- a/src/libpng/pngwutil.c
+++ b/src/thirdparty/libpng/pngwutil.c
diff --git a/src/apps/mplayerc/pngdib.c b/src/thirdparty/pngdib/pngdib.c
index 3061b83aa..3f9da2f12 100644
--- a/src/apps/mplayerc/pngdib.c
+++ b/src/thirdparty/pngdib/pngdib.c
@@ -12,7 +12,7 @@
 #include <malloc.h>

 #include <math.h>

 

-#include "../../libpng/png.h"

+#include "../libpng/png.h"

 

 #define PNGDIB_INTERNALS

 #include "pngdib.h"

diff --git a/src/apps/mplayerc/pngdib.h b/src/thirdparty/pngdib/pngdib.h
index e492e4e73..e492e4e73 100644
--- a/src/apps/mplayerc/pngdib.h
+++ b/src/thirdparty/pngdib/pngdib.h
diff --git a/src/zlib/ChangeLog b/src/thirdparty/zlib/ChangeLog
index f310bb0fc..f310bb0fc 100644
--- a/src/zlib/ChangeLog
+++ b/src/thirdparty/zlib/ChangeLog
diff --git a/src/zlib/FAQ b/src/thirdparty/zlib/FAQ
index 1a22750a5..1a22750a5 100644
--- a/src/zlib/FAQ
+++ b/src/thirdparty/zlib/FAQ
diff --git a/src/zlib/README b/src/thirdparty/zlib/README
index d4219bf88..d4219bf88 100644
--- a/src/zlib/README
+++ b/src/thirdparty/zlib/README
diff --git a/src/zlib/adler32.c b/src/thirdparty/zlib/adler32.c
index 65ad6a5ad..65ad6a5ad 100644
--- a/src/zlib/adler32.c
+++ b/src/thirdparty/zlib/adler32.c
diff --git a/src/zlib/compress.c b/src/thirdparty/zlib/compress.c
index ea4dfbe9d..ea4dfbe9d 100644
--- a/src/zlib/compress.c
+++ b/src/thirdparty/zlib/compress.c
diff --git a/src/zlib/crc32.c b/src/thirdparty/zlib/crc32.c
index 91be372d2..91be372d2 100644
--- a/src/zlib/crc32.c
+++ b/src/thirdparty/zlib/crc32.c
diff --git a/src/zlib/crc32.h b/src/thirdparty/zlib/crc32.h
index 8053b6117..8053b6117 100644
--- a/src/zlib/crc32.h
+++ b/src/thirdparty/zlib/crc32.h
diff --git a/src/zlib/deflate.c b/src/thirdparty/zlib/deflate.c
index 5c4022f3d..5c4022f3d 100644
--- a/src/zlib/deflate.c
+++ b/src/thirdparty/zlib/deflate.c
diff --git a/src/zlib/deflate.h b/src/thirdparty/zlib/deflate.h
index cbf0d1ea5..cbf0d1ea5 100644
--- a/src/zlib/deflate.h
+++ b/src/thirdparty/zlib/deflate.h
diff --git a/src/zlib/gzclose.c b/src/thirdparty/zlib/gzclose.c
index caeb99a31..caeb99a31 100644
--- a/src/zlib/gzclose.c
+++ b/src/thirdparty/zlib/gzclose.c
diff --git a/src/zlib/gzguts.h b/src/thirdparty/zlib/gzguts.h
index 0f8fb79f8..0f8fb79f8 100644
--- a/src/zlib/gzguts.h
+++ b/src/thirdparty/zlib/gzguts.h
diff --git a/src/zlib/gzlib.c b/src/thirdparty/zlib/gzlib.c
index 603e60ed5..603e60ed5 100644
--- a/src/zlib/gzlib.c
+++ b/src/thirdparty/zlib/gzlib.c
diff --git a/src/zlib/gzread.c b/src/thirdparty/zlib/gzread.c
index 548201ab0..548201ab0 100644
--- a/src/zlib/gzread.c
+++ b/src/thirdparty/zlib/gzread.c
diff --git a/src/zlib/gzwrite.c b/src/thirdparty/zlib/gzwrite.c
index e8defc688..e8defc688 100644
--- a/src/zlib/gzwrite.c
+++ b/src/thirdparty/zlib/gzwrite.c
diff --git a/src/zlib/infback.c b/src/thirdparty/zlib/infback.c
index af3a8c965..af3a8c965 100644
--- a/src/zlib/infback.c
+++ b/src/thirdparty/zlib/infback.c
diff --git a/src/zlib/inffast.c b/src/thirdparty/zlib/inffast.c
index 2f1d60b43..2f1d60b43 100644
--- a/src/zlib/inffast.c
+++ b/src/thirdparty/zlib/inffast.c
diff --git a/src/zlib/inffast.h b/src/thirdparty/zlib/inffast.h
index e5c1aa4ca..e5c1aa4ca 100644
--- a/src/zlib/inffast.h
+++ b/src/thirdparty/zlib/inffast.h
diff --git a/src/zlib/inffixed.h b/src/thirdparty/zlib/inffixed.h
index 75ed4b597..75ed4b597 100644
--- a/src/zlib/inffixed.h
+++ b/src/thirdparty/zlib/inffixed.h
diff --git a/src/zlib/inflate.c b/src/thirdparty/zlib/inflate.c
index a8431abea..a8431abea 100644
--- a/src/zlib/inflate.c
+++ b/src/thirdparty/zlib/inflate.c
diff --git a/src/zlib/inflate.h b/src/thirdparty/zlib/inflate.h
index 95f4986d4..95f4986d4 100644
--- a/src/zlib/inflate.h
+++ b/src/thirdparty/zlib/inflate.h
diff --git a/src/zlib/inftrees.c b/src/thirdparty/zlib/inftrees.c
index 11e9c52ac..11e9c52ac 100644
--- a/src/zlib/inftrees.c
+++ b/src/thirdparty/zlib/inftrees.c
diff --git a/src/zlib/inftrees.h b/src/thirdparty/zlib/inftrees.h
index baa53a0b1..baa53a0b1 100644
--- a/src/zlib/inftrees.h
+++ b/src/thirdparty/zlib/inftrees.h
diff --git a/src/zlib/trees.c b/src/thirdparty/zlib/trees.c
index 56e9bb1c1..56e9bb1c1 100644
--- a/src/zlib/trees.c
+++ b/src/thirdparty/zlib/trees.c
diff --git a/src/zlib/trees.h b/src/thirdparty/zlib/trees.h
index d35639d82..d35639d82 100644
--- a/src/zlib/trees.h
+++ b/src/thirdparty/zlib/trees.h
diff --git a/src/zlib/uncompr.c b/src/thirdparty/zlib/uncompr.c
index ad98be3a5..ad98be3a5 100644
--- a/src/zlib/uncompr.c
+++ b/src/thirdparty/zlib/uncompr.c
diff --git a/src/zlib/zconf.h b/src/thirdparty/zlib/zconf.h
index 02ce56c43..02ce56c43 100644
--- a/src/zlib/zconf.h
+++ b/src/thirdparty/zlib/zconf.h
diff --git a/src/zlib/zlib.h b/src/thirdparty/zlib/zlib.h
index bfbba83e8..bfbba83e8 100644
--- a/src/zlib/zlib.h
+++ b/src/thirdparty/zlib/zlib.h
diff --git a/src/zlib/zlib.vcproj b/src/thirdparty/zlib/zlib.vcproj
index 42f4f889e..1d06a2612 100644
--- a/src/zlib/zlib.vcproj
+++ b/src/thirdparty/zlib/zlib.vcproj
@@ -22,7 +22,7 @@
 		<Configuration

 			Name="Debug|Win32"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\common.vsprops;..\debug.vsprops"

+			InheritedPropertySheets="..\..\common.vsprops;..\..\debug.vsprops"

 			UseOfMFC="1"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -81,7 +81,7 @@
 		<Configuration

 			Name="Debug|x64"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\common.vsprops;..\debug.vsprops"

+			InheritedPropertySheets="..\..\common.vsprops;..\..\debug.vsprops"

 			UseOfMFC="1"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -142,7 +142,7 @@
 		<Configuration

 			Name="Release|Win32"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\common.vsprops;..\release.vsprops"

+			InheritedPropertySheets="..\..\common.vsprops;..\..\release.vsprops"

 			UseOfMFC="1"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -201,7 +201,7 @@
 		<Configuration

 			Name="Release|x64"

 			ConfigurationType="4"

-			InheritedPropertySheets="..\common.vsprops;..\release.vsprops"

+			InheritedPropertySheets="..\..\common.vsprops;..\..\release.vsprops"

 			UseOfMFC="1"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

diff --git a/src/zlib/zutil.c b/src/thirdparty/zlib/zutil.c
index 898ed345b..898ed345b 100644
--- a/src/zlib/zutil.c
+++ b/src/thirdparty/zlib/zutil.c
diff --git a/src/zlib/zutil.h b/src/thirdparty/zlib/zutil.h
index 258fa8879..258fa8879 100644
--- a/src/zlib/zutil.h
+++ b/src/thirdparty/zlib/zutil.h