diff options
| author | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-14 17:56:29 +0000 |
|---|---|---|
| committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-14 17:56:29 +0000 |
| commit | dde6ba8352e440f60415ffd911c44758f67452a1 (patch) | |
| tree | 2a88d21c2354745ade7c6d9e6e4c905606764a7c /stream/tvi_v4l.c | |
| parent | 2585d1e148c0fa984b7255d558d4300613bc1388 (diff) | |
| download | mpv-dde6ba8352e440f60415ffd911c44758f67452a1.tar.bz2 mpv-dde6ba8352e440f60415ffd911c44758f67452a1.tar.xz | |
Fix mplayer segfault when v4l driver initialization (at setting norm
stage) failed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24787 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/tvi_v4l.c')
| -rw-r--r-- | stream/tvi_v4l.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index adbdf927c7..c21e13475e 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -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) { |