From cbbbf761c351100b3035df82436ddebe85897e8d Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 3 Aug 2006 18:59:37 +0000 Subject: correctly report audio input git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19300 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_pvr.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'stream') 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 { -- cgit v1.2.3