* DSUtil.cpp: remove unused variable

* DSUtil.h: include afxstr.h for CString
* IPinHook.h: don't mark HookAMVideoAccelerator and HookDirectXVideoDecoderService as extern

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

3 files changed, 5 insertions, 4 deletions

diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp
index 80916ce96..e5231f3c5 100644
--- a/src/DSUtil/DSUtil.cpp
+++ b/src/DSUtil/DSUtil.cpp
@@ -2894,7 +2894,7 @@ void getExtraData(const BYTE *format, const GUID *formattype, const size_t forma
 	const BYTE *extraposition = NULL;

 	size_t extralength = 0;

 	if (*formattype == FORMAT_WaveFormatEx) {

-		WAVEFORMATEX *wfex = (WAVEFORMATEX *)format;

+		//WAVEFORMATEX *wfex = (WAVEFORMATEX *)format;

 		extraposition = format + sizeof(WAVEFORMATEX);

 		// Protected against over-reads

 		extralength   = formatlen - sizeof(WAVEFORMATEX);

diff --git a/src/DSUtil/DSUtil.h b/src/DSUtil/DSUtil.h
index ac253fd65..bace9c70b 100644
--- a/src/DSUtil/DSUtil.h
+++ b/src/DSUtil/DSUtil.h
@@ -23,6 +23,7 @@
 

 #pragma once

 

+#include <afxstr.h>

 #include "NullRenderers.h"

 #include "HdmvClipInfo.h"

 #include "H264Nalu.h"

@@ -200,7 +201,7 @@ public:
  

 #define EndEnumSysDev }}}

 

-#define QI(i) (riid == __uuidof(i)) ? GetInterface((i*)this, ppv) :

+#define QI(i)  (riid == __uuidof(i)) ? GetInterface((i*)this, ppv) :

 #define QI2(i) (riid == IID_##i) ? GetInterface((i*)this, ppv) :

 

 template <typename T> __inline void INITDDSTRUCT(T& dd)

diff --git a/src/filters/renderer/VideoRenderers/IPinHook.h b/src/filters/renderer/VideoRenderers/IPinHook.h
index 645d784f9..67b6f82ad 100644
--- a/src/filters/renderer/VideoRenderers/IPinHook.h
+++ b/src/filters/renderer/VideoRenderers/IPinHook.h
@@ -174,10 +174,10 @@ interface IAMVideoAcceleratorC {
 	CONST_VTBL struct IAMVideoAcceleratorCVtbl *lpVtbl;

 };

 

-extern void HookAMVideoAccelerator(IAMVideoAcceleratorC* pAMVideoAcceleratorC);

+void HookAMVideoAccelerator(IAMVideoAcceleratorC* pAMVideoAcceleratorC);

 

 // DXVA2 hooks

-extern void HookDirectXVideoDecoderService(void* pIDirectXVideoDecoderService);

+void HookDirectXVideoDecoderService(void* pIDirectXVideoDecoderService);

 LPCTSTR GetDXVADecoderDescription();

 LPCTSTR GetDXVAVersion();

 void ClearDXVAState();
\ No newline at end of file