diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
| commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
| tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /loader/dshow/graph.h | |
| parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
| parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
| download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'loader/dshow/graph.h')
| -rw-r--r-- | loader/dshow/graph.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/loader/dshow/graph.h b/loader/dshow/graph.h index 2fa72b49b4..7667f5a39e 100644 --- a/loader/dshow/graph.h +++ b/loader/dshow/graph.h @@ -52,25 +52,6 @@ struct FilterGraph { HRESULT STDCALL (*SetDefaultSyncSource)(FilterGraph* This); }; - -HRESULT STDCALL FilterGraph_AddFilter(FilterGraph* This, - IBaseFilter* pFilter, - unsigned short* pName); -HRESULT STDCALL FilterGraph_RemoveFilter(FilterGraph* This, - IBaseFilter* pFilter); -HRESULT STDCALL FilterGraph_EnumFilters(FilterGraph* This, - IEnumFilters** ppEnum); -HRESULT STDCALL FilterGraph_FindFilterByName(FilterGraph* This, - unsigned short* pName, - IBaseFilter** ppFilter); -HRESULT STDCALL FilterGraph_ConnectDirect(FilterGraph* This, - IPin* ppinOut, - IPin* ppinIn, - const AM_MEDIA_TYPE* pmt); -HRESULT STDCALL FilterGraph_Reconnect(FilterGraph* This, IPin* ppin); -HRESULT STDCALL FilterGraph_Disconnect(FilterGraph* This, IPin* ppin); -HRESULT STDCALL FilterGraph_SetDefaultSyncSource(FilterGraph* This); - FilterGraph* FilterGraphCreate(void); #endif /* MPLAYER_GRAPH_H */ |