aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-fileops.c
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-01-01 17:02:31 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:24 -0400
commit0d82fe801d7c6d8cb8987e66b570f6decde9e235 (patch)
treec161730acec942f8474516d5aa7587d6d64e2fd9 /drivers/media/video/cx18/cx18-fileops.c
parent50299994181b835e5a6ee2882df2ee07e7fb4491 (diff)
V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18
Initial addition of controls to set AC-3 audio encoding for the CX23418 - it does not work yet due to firmware or cx18 driver issues. This change affects the common cx2341x and ivtv modules due to shared structures and common functions. Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-fileops.c')
-rw-r--r--drivers/media/video/cx18/cx18-fileops.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 055f6e004b2d..863d29db85eb 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -128,10 +128,10 @@ static void cx18_release_stream(struct cx18_stream *s)
128static void cx18_dualwatch(struct cx18 *cx) 128static void cx18_dualwatch(struct cx18 *cx)
129{ 129{
130 struct v4l2_tuner vt; 130 struct v4l2_tuner vt;
131 u16 new_bitmap; 131 u32 new_bitmap;
132 u16 new_stereo_mode; 132 u32 new_stereo_mode;
133 const u16 stereo_mask = 0x0300; 133 const u32 stereo_mask = 0x0300;
134 const u16 dual = 0x0200; 134 const u32 dual = 0x0200;
135 u32 h; 135 u32 h;
136 136
137 new_stereo_mode = cx->params.audio_properties & stereo_mask; 137 new_stereo_mode = cx->params.audio_properties & stereo_mask;