diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-23 16:11:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-23 16:11:54 -0300 |
| commit | 8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf (patch) | |
| tree | 472c338929bdcb87f76a7824bf1602378ab34d03 /linux/drivers/media/video/cx88/cx88.h | |
| parent | 27db32c1fbbd03a1427f7b783dcc7eee372c953e (diff) | |
| parent | 47e7619ed0e11061799a387d580aa2aa90561ead (diff) | |
| download | mediapointer-dvb-s2-8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf.tar.gz mediapointer-dvb-s2-8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/mpeg-api
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index efeef4b47..c8049ec2b 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -29,6 +29,7 @@ #include <media/tuner.h> #include <media/tveeprom.h> #include <media/video-buf.h> +#include <media/cx2341x.h> #ifdef HAVE_VIDEO_BUF_DVB #include <media/video-buf-dvb.h> #endif @@ -432,14 +433,6 @@ struct cx8802_suspend_state { int disabled; }; -/* TODO: move this to struct v4l2_mpeg_compression ? */ -struct blackbird_dnr { - u32 mode; - u32 type; - u32 spatial; - u32 temporal; -}; - struct cx8802_dev { struct cx88_core *core; #if 0 @@ -479,8 +472,7 @@ struct cx8802_dev { unsigned char ts_gen_cntrl; /* mpeg params */ - struct v4l2_mpeg_compression params; - struct blackbird_dnr dnr_params; + struct cx2341x_mpeg_params params; }; /* ----------------------------------------------------------- */ @@ -645,10 +637,6 @@ extern int cx88_do_ioctl(struct inode *inode, struct file *file, int radio, extern int (*cx88_ioctl_hook)(struct inode *inode, struct file *file, unsigned int cmd, void *arg); extern unsigned int (*cx88_ioctl_translator)(unsigned int cmd); -void blackbird_set_params(struct cx8802_dev *dev, - struct v4l2_mpeg_compression *params); -void blackbird_set_dnr_params(struct cx8802_dev *dev, - struct blackbird_dnr* dnr_params); /* * Local variables: |