[Mplayer-cvslog] CVS: main/libmpdemux tvi_v4l.c,1.35,1.36

[Jindrich Makovicka CVS]

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

Modified Files:
	tvi_v4l.c 
Log Message:
minor fixes in forceaudio option

Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tvi_v4l.c	22 Oct 2002 07:56:13 -0000	1.35
+++ tvi_v4l.c	22 Oct 2002 15:33:41 -0000	1.36
@@ -515,7 +515,15 @@
 	else
 	    priv->audio_id = 0;
 	audio_in_set_samplerate(&priv->audio_in, 44100);
-	audio_in_set_channels(&priv->audio_in, priv->audio_channels[priv->audio_id]);
+	if (priv->capability.audios) {
+	    audio_in_set_channels(&priv->audio_in, priv->audio_channels[priv->audio_id]);
+	} else {
+	    if (tv_param_forcechan >= 0) {
+		audio_in_set_channels(&priv->audio_in, tv_param_forcechan);
+	    } else {
+		audio_in_set_channels(&priv->audio_in, 2);
+	    }
+	}
 	if (audio_in_setup(&priv->audio_in) < 0) return 0;
 	setup_audio_buffer_sizes(priv);
     }