[MPlayer-cvslog] r24787 - trunk/stream/tvi_v4l.c

[voroshil]

Author: voroshil
Date: Sun Oct 14 19:56:29 2007
New Revision: 24787

Log:
Fix mplayer segfault when v4l driver initialization (at setting norm
stage) failed.



Modified:
   trunk/stream/tvi_v4l.c

Modified: trunk/stream/tvi_v4l.c
==============================================================================
--- trunk/stream/tvi_v4l.c	(original)
+++ trunk/stream/tvi_v4l.c	Sun Oct 14 19:56:29 2007
@@ -693,7 +693,9 @@ static int uninit(priv_t *priv)
         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) {