# HG changeset patch # User faust3 # Date 1123352398 0 # Node ID 973b82bf1187c5a2133b791cad2576e1e1389668 # Parent 04dd5945fab89a5a8c95f7855d381c602eaa530a do not crash when /dev/video0 is not present diff -r 04dd5945fab8 -r 973b82bf1187 libmpdemux/tvi_v4l2.c --- a/libmpdemux/tvi_v4l2.c Sat Aug 06 16:15:07 2005 +0000 +++ b/libmpdemux/tvi_v4l2.c Sat Aug 06 18:19:58 2005 +0000 @@ -857,7 +857,8 @@ int i, frames, dropped = 0; priv->shutdown = 1; - pthread_join(priv->video_grabber_thread, NULL); + if(priv->video_grabber_thread) + pthread_join(priv->video_grabber_thread, NULL); pthread_mutex_destroy(&priv->video_buffer_mutex); if (priv->streamon) { @@ -906,7 +907,7 @@ /* free memory and close device */ free(priv->map); priv->map = NULL; priv->mapcount = 0; - close(priv->video_fd); priv->video_fd = -1; + if(priv->video_fd!=-1)close(priv->video_fd); priv->video_fd = -1; free(priv->video_dev); priv->video_dev = NULL; if (priv->video_ringbuffer) {