# HG changeset patch # User voroshil # Date 1192384589 0 # Node ID cdd41bcc9603fc82cd9e467f7365bbe8a7fe0c66 # Parent 8383cea01fff08920eb43a6dcb0af17829308f13 Fix mplayer segfault when v4l driver initialization (at setting norm stage) failed. diff -r 8383cea01fff -r cdd41bcc9603 stream/tvi_v4l.c --- a/stream/tvi_v4l.c Sun Oct 14 16:44:32 2007 +0000 +++ b/stream/tvi_v4l.c Sun Oct 14 17:56:29 2007 +0000 @@ -693,7 +693,9 @@ pthread_mutex_destroy(&priv->skew_mutex); } pthread_mutex_destroy(&priv->video_buffer_mutex); - pthread_join(priv->video_grabber_thread, NULL); + if(priv->video_grabber_thread) + pthread_join(priv->video_grabber_thread, NULL); + mp_msg(MSGT_TV, MSGL_V, "done\n"); if (priv->capability.audios) {