diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /loader | |
parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz |
Merge svn changes up to r27899
Diffstat (limited to 'loader')
-rw-r--r-- | loader/dshow/outputpin.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c index d60ecd4128..534ff13615 100644 --- a/loader/dshow/outputpin.c +++ b/loader/dshow/outputpin.c @@ -159,12 +159,12 @@ IMPLEMENT_IUNKNOWN(CEnumMediaTypes) */ static CEnumMediaTypes* CEnumMediaTypesCreate(const AM_MEDIA_TYPE* amt) { - CEnumMediaTypes *This = (CEnumMediaTypes*) malloc(sizeof(CEnumMediaTypes)) ; + CEnumMediaTypes *This = malloc(sizeof(CEnumMediaTypes)) ; if (!This) return NULL; - This->vt = (IEnumMediaTypes_vt*) malloc(sizeof(IEnumMediaTypes_vt)); + This->vt = malloc(sizeof(IEnumMediaTypes_vt)); if (!This->vt) { free(This); @@ -893,19 +893,20 @@ static HRESULT STDCALL COutputMemPin_Release(IUnknown* This) */ COutputPin* COutputPinCreate(const AM_MEDIA_TYPE* amt,SAMPLEPROC SampleProc,void* pUserData) { - COutputPin* This = (COutputPin*) malloc(sizeof(COutputPin)); + COutputPin* This = malloc(sizeof(COutputPin)); IMemInputPin_vt* ivt; if (!This) return NULL; - This->vt = (IPin_vt*) malloc(sizeof(IPin_vt)); - This->mempin = (COutputMemPin*) malloc(sizeof(COutputMemPin)); - ivt = (IMemInputPin_vt*) malloc(sizeof(IMemInputPin_vt)); + This->vt = malloc(sizeof(IPin_vt)); + This->mempin = malloc(sizeof(COutputMemPin)); + ivt = malloc(sizeof(IMemInputPin_vt)); if (!This->vt || !This->mempin || !ivt) { COutputPin_Destroy(This); + free(ivt); return NULL; } |