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/allocator.c | |
| 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/allocator.c')
| -rw-r--r-- | loader/dshow/allocator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c index a90bd9d3d2..744debf968 100644 --- a/loader/dshow/allocator.c +++ b/loader/dshow/allocator.c @@ -114,6 +114,7 @@ static inline avm_list_t* avm_list_find(avm_list_t* head, void* member) return NULL; } +#ifdef WIN32_LOADER static long MemAllocator_CreateAllocator(GUID* clsid, const GUID* iid, void** ppv) { IUnknown* p; @@ -130,6 +131,7 @@ static long MemAllocator_CreateAllocator(GUID* clsid, const GUID* iid, void** pp return result; } +#endif static HRESULT STDCALL MemAllocator_SetProperties(IMemAllocator * This, /* [in] */ ALLOCATOR_PROPERTIES *pRequest, |