Mercurial > mplayer.hg
comparison stream/tvi_v4l2.c @ 32511:b39155e98ac3
Remove some useless NULL pointer checks before invoking free() on the pointer.
patch by From: Clment Bsch, ubitux gmail com
| author | diego |
|---|---|
| date | Sun, 07 Nov 2010 12:47:40 +0000 |
| parents | 76f94c00a69f |
| children | cb671a73f3a3 |
comparison
equal
deleted
inserted
replaced
| 32510:b756312f1d15 | 32511:b39155e98ac3 |
|---|---|
| 1110 if(priv->vbi_fd){ | 1110 if(priv->vbi_fd){ |
| 1111 close(priv->vbi_fd); | 1111 close(priv->vbi_fd); |
| 1112 priv->vbi_fd=0; | 1112 priv->vbi_fd=0; |
| 1113 } | 1113 } |
| 1114 | 1114 |
| 1115 if(priv->vbi_dev){ | 1115 free(priv->vbi_dev); |
| 1116 free(priv->vbi_dev); | 1116 priv->vbi_dev = NULL; |
| 1117 priv->vbi_dev=0; | |
| 1118 } | |
| 1119 priv->shutdown = 1; | 1117 priv->shutdown = 1; |
| 1120 if(priv->video_grabber_thread) | 1118 if(priv->video_grabber_thread) |
| 1121 pthread_join(priv->video_grabber_thread, NULL); | 1119 pthread_join(priv->video_grabber_thread, NULL); |
| 1122 pthread_mutex_destroy(&priv->video_buffer_mutex); | 1120 pthread_mutex_destroy(&priv->video_buffer_mutex); |
| 1123 | 1121 |
| 1171 free(priv->video_ringbuffer[i].data); | 1169 free(priv->video_ringbuffer[i].data); |
| 1172 } | 1170 } |
| 1173 free(priv->video_ringbuffer); | 1171 free(priv->video_ringbuffer); |
| 1174 } | 1172 } |
| 1175 if (!priv->tv_param->noaudio) { | 1173 if (!priv->tv_param->noaudio) { |
| 1176 if (priv->audio_ringbuffer) | 1174 free(priv->audio_ringbuffer); |
| 1177 free(priv->audio_ringbuffer); | 1175 free(priv->audio_skew_buffer); |
| 1178 if (priv->audio_skew_buffer) | 1176 free(priv->audio_skew_delta_buffer); |
| 1179 free(priv->audio_skew_buffer); | |
| 1180 if (priv->audio_skew_delta_buffer) | |
| 1181 free(priv->audio_skew_delta_buffer); | |
| 1182 | 1177 |
| 1183 audio_in_uninit(&priv->audio_in); | 1178 audio_in_uninit(&priv->audio_in); |
| 1184 } | 1179 } |
| 1185 | 1180 |
| 1186 /* show some nice statistics ;-) */ | 1181 /* show some nice statistics ;-) */ |