diff options
| author | Catalin Climov <devnull@localhost> | 2005-08-17 20:55:37 +0000 |
|---|---|---|
| committer | Catalin Climov <devnull@localhost> | 2005-08-17 20:55:37 +0000 |
| commit | b3f409c46b9b52d0526cc21ac645a19d8f8e7662 (patch) | |
| tree | 66f1cf6de83cef0f08993ff57d272f8953671058 /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | cad4a4110faf2672fc6dec4d5ca6c09ccac2e3e2 (diff) | |
| download | mediapointer-dvb-s2-b3f409c46b9b52d0526cc21ac645a19d8f8e7662.tar.gz mediapointer-dvb-s2-b3f409c46b9b52d0526cc21ac645a19d8f8e7662.tar.bz2 | |
Small mpeg fixes and cleanups for blackbird.
* cx88-blackbird.c:
- fix mpeg packet size & count
- add VIDIOC_QUERYCAP ioctl for the mpeg stream
- return more information in struct v4l2_format
- fix default window height
* cx88-video.c:
- small cleanups
Signed-off-by: Catalin Climov <catalin@climov.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 7401b1245..705485ea7 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.88 2005/08/17 19:42:11 nsh Exp $ + * $Id: cx88-video.c,v 1.89 2005/08/17 20:55:37 catalin Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1113,9 +1113,9 @@ static int video_release(struct inode *inode, struct file *file) videobuf_mmap_free(&fh->vbiq); file->private_data = NULL; kfree(fh); - + cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL); - + return 0; } @@ -1376,6 +1376,8 @@ static int video_do_ioctl(struct inode *inode, struct file *file, if (video_debug > 1) cx88_print_ioctl(core->name,cmd); switch (cmd) { + + /* --- capabilities ------------------------------------------ */ case VIDIOC_QUERYCAP: { struct v4l2_capability *cap = arg; @@ -1391,7 +1393,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, V4L2_CAP_READWRITE | V4L2_CAP_STREAMING | V4L2_CAP_VBI_CAPTURE | -#if 0 +#if 1 V4L2_CAP_VIDEO_OVERLAY | #endif 0; |