summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorsesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-09 12:40:14 +0000
committersesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-09 12:40:14 +0000
commitf08a70d7df96e78cb2694fb0927acc4997e51254 (patch)
treeb7b6eafc9765ca3cb16c74848693691d9267b202 /loader
parent27aa3db23e80a4caf90f0929bbaf1a22a6420c34 (diff)
downloadmpv-f08a70d7df96e78cb2694fb0927acc4997e51254.tar.bz2
mpv-f08a70d7df96e78cb2694fb0927acc4997e51254.tar.xz
Style changes as requested by Diego.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30872 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r--loader/dshow/graph.c34
-rw-r--r--loader/dshow/graph.h41
2 files changed, 37 insertions, 38 deletions
diff --git a/loader/dshow/graph.c b/loader/dshow/graph.c
index 783ccac7f4..4f13c0f832 100644
--- a/loader/dshow/graph.c
+++ b/loader/dshow/graph.c
@@ -5,12 +5,13 @@
* http://svn.mplayerhq.hu/mplayer/trunk/
*/
+#include <stdio.h>
+#include <stdlib.h>
+
#include "config.h"
#include "loader/com.h"
#include "loader/dshow/graph.h"
#include "loader/wine/winerror.h"
-#include <stdio.h>
-#include <stdlib.h>
// How many FilterGraph objects exist.
// Used for knowing when to register and unregister the class in COM.
@@ -114,27 +115,26 @@ FilterGraph* FilterGraphCreate()
This->vt = calloc(1, sizeof(*This->vt));
- if (!This->vt)
- {
+ if (!This->vt) {
free(This);
return NULL;
}
- This->vt->QueryInterface = FilterGraph_QueryInterface;
- This->vt->AddRef = FilterGraph_AddRef;
- This->vt->Release = FilterGraph_Release;
-
- This->vt->AddFilter = FilterGraph_AddFilter;
- This->vt->RemoveFilter = FilterGraph_RemoveFilter;
- This->vt->EnumFilters = FilterGraph_EnumFilters;
- This->vt->FindFilterByName = FilterGraph_FindFilterByName;
- This->vt->ConnectDirect = FilterGraph_ConnectDirect;
- This->vt->Reconnect = FilterGraph_Reconnect;
- This->vt->Disconnect = FilterGraph_Disconnect;
+ This->vt->QueryInterface = FilterGraph_QueryInterface;
+ This->vt->AddRef = FilterGraph_AddRef;
+ This->vt->Release = FilterGraph_Release;
+
+ This->vt->AddFilter = FilterGraph_AddFilter;
+ This->vt->RemoveFilter = FilterGraph_RemoveFilter;
+ This->vt->EnumFilters = FilterGraph_EnumFilters;
+ This->vt->FindFilterByName = FilterGraph_FindFilterByName;
+ This->vt->ConnectDirect = FilterGraph_ConnectDirect;
+ This->vt->Reconnect = FilterGraph_Reconnect;
+ This->vt->Disconnect = FilterGraph_Disconnect;
This->vt->SetDefaultSyncSource = FilterGraph_SetDefaultSyncSource;
- This->interfaces[0]=IID_IUnknown;
- This->interfaces[1]=IID_IFilterGraph;
+ This->interfaces[0] = IID_IUnknown;
+ This->interfaces[1] = IID_IFilterGraph;
#ifdef WIN32_LOADER
if (GraphKeeper++ == 0)
diff --git a/loader/dshow/graph.h b/loader/dshow/graph.h
index 62423960a0..45697d5e8b 100644
--- a/loader/dshow/graph.h
+++ b/loader/dshow/graph.h
@@ -6,31 +6,30 @@
typedef struct FilterGraph FilterGraph;
-struct FilterGraph
-{
+struct FilterGraph {
IFilterGraph_vt* vt;
DECLARE_IUNKNOWN();
GUID interfaces[2];
- HRESULT STDCALL ( *AddFilter )(FilterGraph* This,
- /* [in] */ IBaseFilter* pFilter,
- /* [string][in] */ unsigned short* pName);
- HRESULT STDCALL ( *RemoveFilter )(FilterGraph* This,
- /* [in] */ IBaseFilter* pFilter);
- HRESULT STDCALL ( *EnumFilters )(FilterGraph* This,
- /* [out] */ IEnumFilters** ppEnum);
- HRESULT STDCALL ( *FindFilterByName )(FilterGraph* This,
- /* [string][in] */ unsigned short* pName,
- /* [out] */ IBaseFilter** ppFilter);
- HRESULT STDCALL ( *ConnectDirect )(FilterGraph* This,
- /* [in] */ IPin* ppinOut,
- /* [in] */ IPin* ppinIn,
- /* [in] */ const AM_MEDIA_TYPE* pmt);
- HRESULT STDCALL ( *Reconnect )(FilterGraph* This,
- /* [in] */ IPin* ppin);
- HRESULT STDCALL ( *Disconnect )(FilterGraph* This,
- /* [in] */ IPin* ppin);
- HRESULT STDCALL ( *SetDefaultSyncSource )(FilterGraph* This);
+ HRESULT STDCALL (*AddFilter)(FilterGraph* This,
+ /* [in] */ IBaseFilter* pFilter,
+ /* [string][in] */ unsigned short* pName);
+ HRESULT STDCALL (*RemoveFilter)(FilterGraph* This,
+ /* [in] */ IBaseFilter* pFilter);
+ HRESULT STDCALL (*EnumFilters)(FilterGraph* This,
+ /* [out] */ IEnumFilters** ppEnum);
+ HRESULT STDCALL (*FindFilterByName)(FilterGraph* This,
+ /* [string][in] */ unsigned short* pName,
+ /* [out] */ IBaseFilter** ppFilter);
+ HRESULT STDCALL (*ConnectDirect)(FilterGraph* This,
+ /* [in] */ IPin* ppinOut,
+ /* [in] */ IPin* ppinIn,
+ /* [in] */ const AM_MEDIA_TYPE* pmt);
+ HRESULT STDCALL (*Reconnect)(FilterGraph* This,
+ /* [in] */ IPin* ppin);
+ HRESULT STDCALL (*Disconnect)(FilterGraph* This,
+ /* [in] */ IPin* ppin);
+ HRESULT STDCALL (*SetDefaultSyncSource)(FilterGraph* This);
};
FilterGraph* FilterGraphCreate(void);