diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-12 15:02:19 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-12 15:02:19 +0400 |
commit | d2886946eacbab6a583bc60b04451d192d6e7852 (patch) | |
tree | dba7071d5a7c32ce05c45bcfe9143980430d9a64 | |
parent | 62bb6c9b03c33ad5b6cad769af61efd30eba162f (diff) |
* 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
-rw-r--r-- | src/DSUtil/DSUtil.cpp | 2 | ||||
-rw-r--r-- | src/DSUtil/DSUtil.h | 3 | ||||
-rw-r--r-- | src/filters/renderer/VideoRenderers/IPinHook.h | 4 |
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 |