diff options
| author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-22 13:19:30 +0000 |
|---|---|---|
| committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-22 13:19:30 +0000 |
| commit | 227df915e5d6f356bd135e5174fe7d0f503d4115 (patch) | |
| tree | 4c87c2a39a0ebfa239a3fe1d8119f33269f18ee3 /libmpdemux | |
| parent | 5e6cd8241b3cb3e45972a2a932155676522a22d8 (diff) | |
| download | mpv-227df915e5d6f356bd135e5174fe7d0f503d4115.tar.bz2 mpv-227df915e5d6f356bd135e5174fe7d0f503d4115.tar.xz | |
fix a segfault when calling loadfile during v4l2 playback
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14215 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tvi_v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c index 0741b77d0c..211ab83029 100644 --- a/libmpdemux/tvi_v4l2.c +++ b/libmpdemux/tvi_v4l2.c @@ -838,7 +838,7 @@ static int uninit(priv_t *priv) } /* stop audio thread */ - if (!tv_param_noaudio) { + if (!tv_param_noaudio && !tv_param_immediate) { pthread_join(priv->audio_grabber_thread, NULL); pthread_mutex_destroy(&priv->skew_mutex); } |