From 12d3e0df9980822282f70dffad148b729dbee541 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 7 Nov 2010 12:47:40 +0000 Subject: cleanup: don't check for NULL before free() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tvi_v4l2.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'stream/tvi_v4l2.c') diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index f5cc9d0897..90cb1a6567 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -1112,10 +1112,8 @@ static int uninit(priv_t *priv) priv->vbi_fd=0; } - if(priv->vbi_dev){ - free(priv->vbi_dev); - priv->vbi_dev=0; - } + free(priv->vbi_dev); + priv->vbi_dev = NULL; priv->shutdown = 1; if(priv->video_grabber_thread) pthread_join(priv->video_grabber_thread, NULL); @@ -1173,12 +1171,9 @@ static int uninit(priv_t *priv) free(priv->video_ringbuffer); } if (!priv->tv_param->noaudio) { - if (priv->audio_ringbuffer) - free(priv->audio_ringbuffer); - if (priv->audio_skew_buffer) - free(priv->audio_skew_buffer); - if (priv->audio_skew_delta_buffer) - free(priv->audio_skew_delta_buffer); + free(priv->audio_ringbuffer); + free(priv->audio_skew_buffer); + free(priv->audio_skew_delta_buffer); audio_in_uninit(&priv->audio_in); } -- cgit v1.2.3