# HG changeset patch # User ben # Date 1154631577 0 # Node ID 6e6b33b0b57e34fe23e239d606f1fe1267af589d # Parent 67a441044abe4e8b7a0ff144c8f3ebb8a6e7ff0a correctly report audio input diff -r 67a441044abe -r 6e6b33b0b57e stream/stream_pvr.c --- a/stream/stream_pvr.c Thu Aug 03 17:34:54 2006 +0000 +++ b/stream/stream_pvr.c Thu Aug 03 18:59:37 2006 +0000 @@ -801,16 +801,8 @@ /* 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 {