Mercurial > mplayer.hg

changeset 17765:7bf483eaa99a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>)
author aurel
date Wed, 08 Mar 2006 00:21:44 +0000
parents 3858a365c3a0
children b8be9bedc108
files libmpdemux/tvi_v4l2.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/tvi_v4l2.c	Tue Mar 07 17:49:37 2006 +0000
+++ b/libmpdemux/tvi_v4l2.c	Wed Mar 08 00:21:44 2006 +0000
@@ -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;