diff options
| author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-08 00:21:44 +0000 |
|---|---|---|
| committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-08 00:21:44 +0000 |
| commit | 0177d932d478c642268c4a594e29130ad10fd56f (patch) | |
| tree | 7272919d9f14b5911f4efec03dc736f18305ac89 /libmpdemux | |
| parent | 6a2cfc6f1f03b357225fee9dbb337973611f8bba (diff) | |
| download | mpv-0177d932d478c642268c4a594e29130ad10fd56f.tar.bz2 mpv-0177d932d478c642268c4a594e29130ad10fd56f.tar.xz | |
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>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17766 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tvi_v4l2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c index d9e7008d99..db52b0633d 100644 --- a/libmpdemux/tvi_v4l2.c +++ b/libmpdemux/tvi_v4l2.c @@ -545,12 +545,11 @@ static int control(priv_t *priv, int cmd, void *arg) 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; |