summaryrefslogtreecommitdiff
path: root/linux/include/media/cx2341x.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 20:59:21 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 20:59:21 -0200
commit7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9 (patch)
tree97e5225cb20e188c19c377d1f115e4ae1f37f34a /linux/include/media/cx2341x.h
parente7ada1bf7bbfdee58d7637d9716fdd8d8b76e4a7 (diff)
parentde00985e053e5742126ccd5299ac49047fecec88 (diff)
downloadmediapointer-dvb-s2-7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9.tar.gz
mediapointer-dvb-s2-7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/cx2341x.h')
-rw-r--r--linux/include/media/cx2341x.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/include/media/cx2341x.h b/linux/include/media/cx2341x.h
index 9ec4d5889..9ebe8558b 100644
--- a/linux/include/media/cx2341x.h
+++ b/linux/include/media/cx2341x.h
@@ -1,5 +1,5 @@
/*
- cx23415/6 header containing common defines.
+ cx23415/6/8 header containing common defines.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@ enum cx2341x_port {
enum cx2341x_cap {
CX2341X_CAP_HAS_SLICED_VBI = 1 << 0,
CX2341X_CAP_HAS_TS = 1 << 1,
+ CX2341X_CAP_HAS_AC3 = 1 << 2,
};
struct cx2341x_mpeg_params {
@@ -47,11 +48,12 @@ struct cx2341x_mpeg_params {
enum v4l2_mpeg_audio_sampling_freq audio_sampling_freq;
enum v4l2_mpeg_audio_encoding audio_encoding;
enum v4l2_mpeg_audio_l2_bitrate audio_l2_bitrate;
+ enum v4l2_mpeg_audio_ac3_bitrate audio_ac3_bitrate;
enum v4l2_mpeg_audio_mode audio_mode;
enum v4l2_mpeg_audio_mode_extension audio_mode_extension;
enum v4l2_mpeg_audio_emphasis audio_emphasis;
enum v4l2_mpeg_audio_crc audio_crc;
- u16 audio_properties;
+ u32 audio_properties;
u16 audio_mute;
/* video */