[MPlayer-cvslog] CVS: main/libmpdemux tvi_v4l2.c,1.17,1.18

Aurelien Jacobs CVS syncmail at mplayerhq.hu
Wed Dec 22 14:19:33 CET 2004


CVS change done by Aurelien Jacobs CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv1206/libmpdemux

Modified Files:
	tvi_v4l2.c 
Log Message:
fix a segfault when calling loadfile during v4l2 playback

Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tvi_v4l2.c	19 Nov 2004 13:04:24 -0000	1.17
+++ tvi_v4l2.c	22 Dec 2004 13:19:30 -0000	1.18
@@ -838,7 +838,7 @@
     }
 
     /* 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);
     }




More information about the MPlayer-cvslog mailing list