[Mplayer-cvslog] CVS: main/libmpdemux tvi_v4l.c,1.22,1.23

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv27937

Modified Files:
	tvi_v4l.c 
Log Message:
tv audio fixing patch by Paul Ortyl <ortylp at 3miasto.net>

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tvi_v4l.c	5 Jun 2002 01:49:03 -0000	1.22
+++ tvi_v4l.c	23 Jun 2002 17:28:44 -0000	1.23
@@ -637,6 +637,9 @@
 	    priv->picture.contrast = (int)*(void **)arg;
 	    control(priv, TVI_CONTROL_VID_SET_PICTURE, 0);
 	    return(TVI_CONTROL_TRUE);
+	case TVI_CONTROL_VID_GET_FPS:
+	    (int)*(void **)arg=priv->fps;
+	    return(TVI_CONTROL_TRUE);
 
 	/* ========== TUNER controls =========== */
 	case TVI_CONTROL_TUN_GET_FREQ:
@@ -743,10 +746,9 @@
 	}
 	case TVI_CONTROL_AUD_SET_SAMPLERATE:
 	{
-	    priv->audio_samplerate[priv->audio_id] = (int)*(void **)arg;
+	    int tmp = priv->audio_samplerate[priv->audio_id] = (int)*(void **)arg;
 	    
-	    if (ioctl(priv->audio_fd, SNDCTL_DSP_SPEED,
-		&priv->audio_samplerate[priv->audio_id]) == -1)
+	    if (ioctl(priv->audio_fd, SNDCTL_DSP_SPEED, &tmp) == -1)
 		return(TVI_CONTROL_FALSE);
 	    priv->audio_samplesize[priv->audio_id] =
 		priv->audio_samplerate[priv->audio_id]/8/priv->fps*