summaryrefslogtreecommitdiffstats
path: root/stream/stream_pvr.c
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-03 18:59:37 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-03 18:59:37 +0000
commitcbbbf761c351100b3035df82436ddebe85897e8d (patch)
treeca68398966b32946fcae6a51a1d56d63c798ac9a /stream/stream_pvr.c
parent70d49ab5e8338b8ff69be0b6bbb31fc8f8b143b2 (diff)
downloadmpv-cbbbf761c351100b3035df82436ddebe85897e8d.tar.bz2
mpv-cbbbf761c351100b3035df82436ddebe85897e8d.tar.xz
correctly report audio input
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19300 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream_pvr.c')
-rw-r--r--stream/stream_pvr.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index f060b94796..e2823d35f1 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -801,16 +801,8 @@ v4l2_display_settings (struct pvr_t *pvr)
/* get current audio input */
if (ioctl (pvr->dev_fd, VIDIOC_G_AUDIO, &vaudio) == 0)
{
- vaudio.index = input;
- if (ioctl (pvr->dev_fd, VIDIOC_ENUMAUDIO, &vaudio) < 0)
- {
- mp_msg (MSGT_OPEN, MSGL_ERR,
- "%s can't get input (%s).\n", LOG_LEVEL_V4L2, strerror (errno));
- return -1;
- }
- else
- mp_msg (MSGT_OPEN, MSGL_INFO,
- "%s Audio input: %s\n", LOG_LEVEL_V4L2, vaudio.name);
+ mp_msg (MSGT_OPEN, MSGL_INFO,
+ "%s Audio input: %s\n", LOG_LEVEL_V4L2, vaudio.name);
}
else
{