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/cmediasample.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/cmediasample.c')
-rw-r--r-- | loader/dshow/cmediasample.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index e0519129eb..8c0015e027 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -47,7 +47,7 @@ void CMediaSample_Destroy(CMediaSample* This) free(This->vt); free(This->own_block); if (This->media_type.pbFormat) - CoTaskMemFree(This->media_type.pbFormat); + free(This->media_type.pbFormat); free(This); } @@ -171,10 +171,10 @@ static HRESULT STDCALL CMediaSample_GetMediaType(IMediaSample* This, } t = &((CMediaSample*)This)->media_type; - // if(t.pbFormat)CoTaskMemFree(t.pbFormat); - (*ppMediaType) = (AM_MEDIA_TYPE*)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + // if(t.pbFormat)free(t.pbFormat); + (*ppMediaType) = (AM_MEDIA_TYPE*)malloc(sizeof(AM_MEDIA_TYPE)); **ppMediaType = *t; - (*ppMediaType)->pbFormat = (char*)CoTaskMemAlloc(t->cbFormat); + (*ppMediaType)->pbFormat = (char*)malloc(t->cbFormat); memcpy((*ppMediaType)->pbFormat, t->pbFormat, t->cbFormat); // *ppMediaType=0; //media type was not changed return 0; @@ -189,11 +189,11 @@ static HRESULT STDCALL CMediaSample_SetMediaType(IMediaSample * This, return E_INVALIDARG; t = &((CMediaSample*)This)->media_type; if (t->pbFormat) - CoTaskMemFree(t->pbFormat); + free(t->pbFormat); t = pMediaType; if (t->cbFormat) { - t->pbFormat = (char*)CoTaskMemAlloc(t->cbFormat); + t->pbFormat = (char*)malloc(t->cbFormat); memcpy(t->pbFormat, pMediaType->pbFormat, t->cbFormat); } else |