summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJanne Grunau <j@jannau.net>2010-07-27 10:40:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 07:56:04 -0200
commitd4533332c0c60335f117ffc65cc4a067314bb441 (patch)
treecf451b3e41acbd65fc435d56b75da1ef73132f79 /drivers
parent35b53664d5d0331c8ec2ef44e74eaf4d18f00c06 (diff)
downloadlinux-stable-d4533332c0c60335f117ffc65cc4a067314bb441.tar.gz
linux-stable-d4533332c0c60335f117ffc65cc4a067314bb441.tar.bz2
linux-stable-d4533332c0c60335f117ffc65cc4a067314bb441.zip
[media] hdpvr: use AC3 as default audio codec for SPDIF
Signed-off-by: Janne Grunau <j@jannau.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/hdpvr/hdpvr-core.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index d75fe5582f26..0ad33c08bfdd 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -326,8 +326,12 @@ static int hdpvr_probe(struct usb_interface *interface,
if (default_video_input < HDPVR_VIDEO_INPUTS)
dev->options.video_input = default_video_input;
- if (default_audio_input < HDPVR_AUDIO_INPUTS)
+ if (default_audio_input < HDPVR_AUDIO_INPUTS) {
dev->options.audio_input = default_audio_input;
+ if (default_audio_input == HDPVR_SPDIF)
+ dev->options.audio_codec =
+ V4L2_MPEG_AUDIO_ENCODING_AC3;
+ }
dev->udev = usb_get_dev(interface_to_usbdev(interface));