[MPlayer-cvslog] CVS: main/libmpdemux tvi_v4l2.c,1.36,1.37

[Aurelien Jacobs CVS]

CVS change done by Aurelien Jacobs CVS

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

Modified Files:
	tvi_v4l2.c 
Log Message:
If we have a tuner, use that as a reason we have audio support, and do
not depend on audioset.
(patch by Jesse Allen <the3dfxdude _at_ gmail.com>)


Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- tvi_v4l2.c	14 Feb 2006 20:13:55 -0000	1.36
+++ tvi_v4l2.c	8 Mar 2006 00:21:44 -0000	1.37
@@ -545,12 +545,11 @@
     struct v4l2_frequency frequency;
 
     switch(cmd) {
-    case TVI_CONTROL_IS_AUDIO:
-	if (tv_param_force_audio) return TVI_CONTROL_TRUE;
-	return priv->input.audioset ? TVI_CONTROL_TRUE: TVI_CONTROL_FALSE;
     case TVI_CONTROL_IS_VIDEO:
 	return priv->capability.capabilities & V4L2_CAP_VIDEO_CAPTURE?
 	    TVI_CONTROL_TRUE: TVI_CONTROL_FALSE;
+    case TVI_CONTROL_IS_AUDIO:
+	if (tv_param_force_audio) return TVI_CONTROL_TRUE;
     case TVI_CONTROL_IS_TUNER:
 	return priv->capability.capabilities & V4L2_CAP_TUNER?
 	    TVI_CONTROL_TRUE: TVI_CONTROL_FALSE;