diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-07 12:47:40 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-08 18:05:12 +0200 |
| commit | 12d3e0df9980822282f70dffad148b729dbee541 (patch) | |
| tree | d298b2c8f5039eae7aeeb16dfd927bea0efcc134 /stream/tvi_dshow.c | |
| parent | af4b23cd36cff0dc34cde59c6a154fd080d11216 (diff) | |
| download | mpv-12d3e0df9980822282f70dffad148b729dbee541.tar.bz2 mpv-12d3e0df9980822282f70dffad148b729dbee541.tar.xz | |
cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/tvi_dshow.c')
| -rw-r--r-- | stream/tvi_dshow.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c index 9394176719..3b4535ac8c 100644 --- a/stream/tvi_dshow.c +++ b/stream/tvi_dshow.c @@ -747,15 +747,12 @@ static void destroy_ringbuffer(grabber_ringbuffer_t * rb) if (rb->ringbuffer) { for (i = 0; i < rb->buffersize; i++) - if (rb->ringbuffer[i]) - free(rb->ringbuffer[i]); + free(rb->ringbuffer[i]); free(rb->ringbuffer); rb->ringbuffer = NULL; } - if (rb->dpts) { - free(rb->dpts); - rb->dpts = NULL; - } + free(rb->dpts); + rb->dpts = NULL; if (rb->pMutex) { DeleteCriticalSection(rb->pMutex); free(rb->pMutex); @@ -2090,15 +2087,13 @@ static HRESULT get_available_formats_stream(chain_t *chain) } if (!done) { for (i = 0; i < count; i++) { - if (pBuf && pBuf[i]) + if (pBuf) free(pBuf[i]); if (arpmt && arpmt[i]) DeleteMediaType(arpmt[i]); } - if (pBuf) - free(pBuf); - if (arpmt) - free(arpmt); + free(pBuf); + free(arpmt); if (hr != S_OK) { mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: Call to GetStreamCaps failed (get_available_formats_stream)\n"); return hr; @@ -2220,8 +2215,7 @@ static HRESULT get_available_formats_pin(ICaptureGraphBuilder2 * pBuilder, for (i = 0; i < count; i++) { if (arpmt[i]) DeleteMediaType(arpmt[i]); - if (pBuf[i]) - free(pBuf[i]); + free(pBuf[i]); } free(arpmt); free(pBuf); |