Merge branch 'master' into zcomploc-support

Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp

1 files changed, 15 insertions, 2 deletions

diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp
index d89e582860..3b06bbb1c0 100644
--- a/Source/Core/VideoCommon/Src/RenderBase.cpp
+++ b/Source/Core/VideoCommon/Src/RenderBase.cpp
@@ -42,6 +42,7 @@
 #include "Host.h"
 #include "XFMemory.h"
 #include "FifoPlayer/FifoRecorder.h"
+#include "AVIDump.h"
 
 #include <cmath>
 #include <string>
@@ -52,7 +53,6 @@ int OSDChoice, OSDTime;
 
 Renderer *g_renderer = NULL;
 
-bool s_bLastFrameDumped = false;
 std::mutex Renderer::s_criticalScreenshot;
 std::string Renderer::s_sScreenshotName;
 
@@ -81,15 +81,28 @@ bool Renderer::s_EnableDLCachingAfterRecording;
 
 unsigned int Renderer::prev_efb_format = (unsigned int)-1;
 
-Renderer::Renderer()
+Renderer::Renderer() : frame_data(NULL), bLastFrameDumped(false)
 {
 	UpdateActiveConfig();
+
+#if defined _WIN32 || defined HAVE_LIBAV
+	bAVIDumping = false;
+#endif
 }
 
 Renderer::~Renderer()
 {
 	// invalidate previous efb format
 	prev_efb_format = (unsigned int)-1;
+
+#if defined _WIN32 || defined HAVE_LIBAV
+	if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping)
+		AVIDump::Stop();
+#else
+	if (pFrameDump.IsOpen())
+		pFrameDump.Close();
+#endif
+	delete[] frame_data;
 }
 
 void Renderer::RenderToXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma)