diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-21 20:12:43 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-21 20:12:43 +0000 |
| commit | 11df85a3dd3bf9f0db534e1d22d55a38996cdd50 (patch) | |
| tree | f17ad8368810fb597dd3f30ff54215fce03f2ae6 /loader/dshow/outputpin.c | |
| parent | 9f6cd22e445429d6ea67b1d936f6d00256b9abf2 (diff) | |
| download | mpv-11df85a3dd3bf9f0db534e1d22d55a38996cdd50.tar.bz2 mpv-11df85a3dd3bf9f0db534e1d22d55a38996cdd50.tar.xz | |
CoTaskMemAlloc/Free vs malloc/free cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9965 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dshow/outputpin.c')
| -rw-r--r-- | loader/dshow/outputpin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c index 14e8af756a..26d3014ad8 100644 --- a/loader/dshow/outputpin.c +++ b/loader/dshow/outputpin.c @@ -51,12 +51,12 @@ static HRESULT STDCALL CEnumMediaTypes_Next(IEnumMediaTypes * This, if (pcFetched) *pcFetched=1; - ppMediaTypes[0] = (AM_MEDIA_TYPE *)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + ppMediaTypes[0] = (AM_MEDIA_TYPE *)malloc(sizeof(AM_MEDIA_TYPE)); // copy structures - C can handle this... **ppMediaTypes = *type; if (ppMediaTypes[0]->pbFormat) { - ppMediaTypes[0]->pbFormat=(char *)CoTaskMemAlloc(ppMediaTypes[0]->cbFormat); + ppMediaTypes[0]->pbFormat=(char *)malloc(ppMediaTypes[0]->cbFormat); memcpy(ppMediaTypes[0]->pbFormat, type->pbFormat, ppMediaTypes[0]->cbFormat); } if (cMediaTypes == 1) @@ -171,7 +171,7 @@ static HRESULT STDCALL COutputPin_Connect(IPin * This, *pmt=((COutputPin*)This)->type; if(pmt->cbFormat>0) { - pmt->pbFormat=CoTaskMemAlloc(pmt->cbFormat); + pmt->pbFormat=malloc(pmt->cbFormat); memcpy(pmt->pbFormat, ((COutputPin*)This)->type.pbFormat, pmt->cbFormat); } */ @@ -214,7 +214,7 @@ static HRESULT STDCALL COutputPin_ConnectionMediaType(IPin * This, *pmt = ((COutputPin*)This)->type; if (pmt->cbFormat>0) { - pmt->pbFormat=(char *)CoTaskMemAlloc(pmt->cbFormat); + pmt->pbFormat=(char *)malloc(pmt->cbFormat); memcpy(pmt->pbFormat, ((COutputPin*)This)->type.pbFormat, pmt->cbFormat); } return 0; |