summaryrefslogtreecommitdiff
path: root/linux/include/media/cx2341x.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:47:31 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:47:31 -0200
commita47be5953c72392a7be1efafc70621242275f08f (patch)
tree8520a9921e37557dc750e4bf453ee44bea637494 /linux/include/media/cx2341x.h
parent98901e271eeb3ffc496d67ebe1f30c744d7e63cd (diff)
parentd075312502f9b70ad11286485861ed9ec0362620 (diff)
downloadmediapointer-dvb-s2-a47be5953c72392a7be1efafc70621242275f08f.tar.gz
mediapointer-dvb-s2-a47be5953c72392a7be1efafc70621242275f08f.tar.bz2
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/cx2341x.h')
-rw-r--r--linux/include/media/cx2341x.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/include/media/cx2341x.h b/linux/include/media/cx2341x.h
index d758a52cf..583b0621f 100644
--- a/linux/include/media/cx2341x.h
+++ b/linux/include/media/cx2341x.h
@@ -40,6 +40,7 @@ struct cx2341x_mpeg_params {
/* stream */
enum v4l2_mpeg_stream_type stream_type;
enum v4l2_mpeg_stream_vbi_fmt stream_vbi_fmt;
+ u16 stream_insert_nav_packets;
/* audio */
enum v4l2_mpeg_audio_sampling_freq audio_sampling_freq;
@@ -50,6 +51,7 @@ struct cx2341x_mpeg_params {
enum v4l2_mpeg_audio_emphasis audio_emphasis;
enum v4l2_mpeg_audio_crc audio_crc;
u16 audio_properties;
+ u16 audio_mute;
/* video */
enum v4l2_mpeg_video_encoding video_encoding;
@@ -61,6 +63,8 @@ struct cx2341x_mpeg_params {
u32 video_bitrate;
u32 video_bitrate_peak;
u16 video_temporal_decimation;
+ u16 video_mute;
+ u32 video_mute_yuv;
/* encoding filters */
enum v4l2_mpeg_cx2341x_video_spatial_filter_mode video_spatial_filter_mode;