From 4c7ea33cb24a219650af6c2a27834f75135ced36 Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Sun, 13 Jan 2002 21:55:39 +0000 Subject: Fix some compiler warnings. CVS patchset: 1399 CVS date: 2002/01/13 21:55:39 --- src/libw32dll/DirectShow/allocator.h | 3 ++- src/libw32dll/DirectShow/inputpin.h | 2 +- src/libw32dll/DirectShow/outputpin.c | 4 +++- src/libw32dll/DirectShow/outputpin.h | 14 ++++++++++++++ 4 files changed, 20 insertions(+), 3 deletions(-) (limited to 'src/libw32dll/DirectShow') diff --git a/src/libw32dll/DirectShow/allocator.h b/src/libw32dll/DirectShow/allocator.h index 855637063..c8c62b2fc 100644 --- a/src/libw32dll/DirectShow/allocator.h +++ b/src/libw32dll/DirectShow/allocator.h @@ -27,6 +27,7 @@ struct _MemAllocator void ( *ResetPointer )(MemAllocator* This); }; -MemAllocator* MemAllocatorCreate(); +MemAllocator* MemAllocatorCreate(void); +void MemAllocator_Destroy(MemAllocator* This); #endif /* DS_ALLOCATOR_H */ diff --git a/src/libw32dll/DirectShow/inputpin.h b/src/libw32dll/DirectShow/inputpin.h index 1ad9a2d60..14c0992d6 100644 --- a/src/libw32dll/DirectShow/inputpin.h +++ b/src/libw32dll/DirectShow/inputpin.h @@ -14,7 +14,7 @@ struct _CBaseFilter2 IPin* ( *GetPin )(CBaseFilter2* This); }; -CBaseFilter2* CBaseFilter2Create(); +CBaseFilter2* CBaseFilter2Create(void); typedef struct _CBaseFilter CBaseFilter; diff --git a/src/libw32dll/DirectShow/outputpin.c b/src/libw32dll/DirectShow/outputpin.c index 4546d0294..bfdf5c027 100644 --- a/src/libw32dll/DirectShow/outputpin.c +++ b/src/libw32dll/DirectShow/outputpin.c @@ -16,6 +16,8 @@ static int unimplemented(const char* s, void* p) return E_NOTIMPL; } +/* In outputpin.h now ********* +****************************** typedef struct CEnumMediaTypes { IEnumMediaTypes_vt* vt; @@ -23,7 +25,7 @@ typedef struct CEnumMediaTypes AM_MEDIA_TYPE type; GUID interfaces[2]; } CEnumMediaTypes; - +********************/ static HRESULT STDCALL CEnumMediaTypes_Next(IEnumMediaTypes * This, /* [in] */ ULONG cMediaTypes, diff --git a/src/libw32dll/DirectShow/outputpin.h b/src/libw32dll/DirectShow/outputpin.h index 016b36787..f95295e59 100644 --- a/src/libw32dll/DirectShow/outputpin.h +++ b/src/libw32dll/DirectShow/outputpin.h @@ -33,4 +33,18 @@ struct _COutputPin COutputPin* COutputPinCreate(const AM_MEDIA_TYPE* vhdr); +typedef struct _CEnumMediaTypes CEnumMediaTypes; + +struct _CEnumMediaTypes +{ + IEnumMediaTypes_vt* vt; + DECLARE_IUNKNOWN(); + AM_MEDIA_TYPE type; + GUID interfaces[2]; +} ; + + +void CEnumMediaTypes_Destroy(CEnumMediaTypes* This); +CEnumMediaTypes* CEnumMediaTypesCreate(const AM_MEDIA_TYPE* amt); + #endif /* DS_OUTPUTPIN_H */ -- cgit v1.2.3