From bed4300a84ac82831cf66d9b13c356cce851fcc0 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Sun, 20 Apr 2014 21:25:11 +0200
Subject: [PATCH] Fixed two memory leaks found by VLD.

---
 src/source_abstract.cpp                | 6 ++++++
 src/thread_encode.cpp                  | 1 +
 src/version.h                          | 2 +-
 x264_launcher_MSVC2013.vcxproj         | 5 +++--
 x264_launcher_MSVC2013.vcxproj.filters | 6 +++---
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/source_abstract.cpp b/src/source_abstract.cpp
index a859bb7..154635a 100644
--- a/src/source_abstract.cpp
+++ b/src/source_abstract.cpp
@@ -128,6 +128,12 @@ bool AbstractSource::checkSourceProperties(unsigned int &frames)
 		process.waitForFinished(-1);
 	}
 
+	while(!patterns.isEmpty())
+	{
+		QRegExp *pattern = patterns.takeFirst();
+		X264_DELETE(pattern);
+	}
+
 	if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
 	{
 		if(!(bTimeout || bAborted))
diff --git a/src/thread_encode.cpp b/src/thread_encode.cpp
index cee4bd0..89626b6 100644
--- a/src/thread_encode.cpp
+++ b/src/thread_encode.cpp
@@ -156,6 +156,7 @@ EncodeThread::~EncodeThread(void)
 	X264_DELETE(m_encoder);
 	X264_DELETE(m_jobObject);
 	X264_DELETE(m_options);
+	X264_DELETE(m_pipedSource);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/version.h b/src/version.h
index 0875f15..c671d44 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 3
 #define VER_X264_PATCH 7
-#define VER_X264_BUILD 848
+#define VER_X264_BUILD 849
 
 #define VER_X264_PORTABLE_EDITION (0)
 
diff --git a/x264_launcher_MSVC2013.vcxproj b/x264_launcher_MSVC2013.vcxproj
index 3b89649..3c6dea9 100644
--- a/x264_launcher_MSVC2013.vcxproj
+++ b/x264_launcher_MSVC2013.vcxproj
@@ -58,6 +58,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;QT_DEBUG;QT_DLL;QT_GUI_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtTest;$(SolutionDir)tmp\uic;$(SolutionDir)etc\vld\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -89,8 +90,8 @@ copy /Y "$(QTDIR)\plugins\imageformats\qsvgd4.dll" "$(TargetDir)\imageformats"
 copy /Y "$(QTDIR)\plugins\imageformats\qjpegd4.dll" "$(TargetDir)\imageformats"
 copy /Y "$(QTDIR)\plugins\imageformats\qtiffd4.dll" "$(TargetDir)\imageformats"
 copy /Y "$(QTDIR)\plugins\imageformats\qgifd4.dll" "$(TargetDir)\imageformats"
-copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.dll" "$(TargetDir)"
-copy /Y "$(SolutionDir)etc\vld\bin\Win32\*.manifest" "$(TargetDir)"
+copy /Y "$(SolutionDir)etc\vld\lib\$(Platform)\$(Configuration)\*.dll" "$(TargetDir)"
+copy /Y "$(SolutionDir)etc\vld\lib\$(Platform)\$(Configuration)\*.manifest" "$(TargetDir)"
 </Command>
     </PostBuildEvent>
     <PostBuildEvent>
diff --git a/x264_launcher_MSVC2013.vcxproj.filters b/x264_launcher_MSVC2013.vcxproj.filters
index 7934e3e..5fe74ca 100644
--- a/x264_launcher_MSVC2013.vcxproj.filters
+++ b/x264_launcher_MSVC2013.vcxproj.filters
@@ -108,9 +108,6 @@
     <ClInclude Include="src\mediainfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\key_filter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\main.cpp">
@@ -343,6 +340,9 @@
     <CustomBuild Include="gui\win_about.ui">
       <Filter>Dialogs</Filter>
     </CustomBuild>
+    <CustomBuild Include="src\input_filter.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="x264_launcher.rc">