Mercurial > mplayer.hg
diff loader/dshow/cmediasample.c @ 9964:6454a2ba2e33
CoTaskMemAlloc/Free vs malloc/free cleanup
author | alex |
---|---|
date | Mon, 21 Apr 2003 20:12:43 +0000 |
parents | 9533c26c0806 |
children | f5537cc95b02 |
line wrap: on
line diff
--- a/loader/dshow/cmediasample.c Mon Apr 21 20:09:08 2003 +0000 +++ b/loader/dshow/cmediasample.c Mon Apr 21 20:12:43 2003 +0000 @@ -47,7 +47,7 @@ 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 @@ } 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 @@ 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