diff options
Diffstat (limited to 'loader/dshow')
| -rw-r--r-- | loader/dshow/cmediasample.c | 2 | ||||
| -rw-r--r-- | loader/dshow/inputpin.c | 6 | ||||
| -rw-r--r-- | loader/dshow/outputpin.c | 9 |
3 files changed, 6 insertions, 11 deletions
diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c index efa3ef89cd..3b7e45bb15 100644 --- a/loader/dshow/cmediasample.c +++ b/loader/dshow/cmediasample.c @@ -351,7 +351,7 @@ static HRESULT STDCALL CMediaSample_GetMediaType(IMediaSample* This, } t = &((CMediaSample*)This)->media_type; - // if(t.pbFormat)free(t.pbFormat); + // free(t.pbFormat); *ppMediaType=CreateMediaType(t); // *ppMediaType=0; //media type was not changed return 0; diff --git a/loader/dshow/inputpin.c b/loader/dshow/inputpin.c index 3227339bee..f3ca4ba6c0 100644 --- a/loader/dshow/inputpin.c +++ b/loader/dshow/inputpin.c @@ -857,8 +857,7 @@ static IPin* CBaseFilter_GetUnusedPin(CBaseFilter* This) */ static void CBaseFilter_Destroy(CBaseFilter* This) { - if (This->vt) - free(This->vt); + free(This->vt); if (This->pin) This->pin->vt->Release((IUnknown*)This->pin); if (This->unused_pin) @@ -1190,8 +1189,7 @@ static void CBaseFilter2_Destroy(CBaseFilter2* This) Debug printf("CBaseFilter2_Destroy(%p) called\n", This); if (This->pin) This->pin->vt->Release((IUnknown*) This->pin); - if (This->vt) - free(This->vt); + free(This->vt); free(This); } diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c index c24c29efb3..ad53303df5 100644 --- a/loader/dshow/outputpin.c +++ b/loader/dshow/outputpin.c @@ -792,12 +792,9 @@ static void COutputPin_SetNewFormat(COutputPin* This, const AM_MEDIA_TYPE* amt) */ static void COutputPin_Destroy(COutputPin* This) { - if (This->mempin->vt) - free(This->mempin->vt); - if (This->mempin) - free(This->mempin); - if (This->vt) - free(This->vt); + free(This->mempin->vt); + free(This->mempin); + free(This->vt); FreeMediaType(&(This->type)); free(This); } |