diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-05-19 19:50:35 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-05-19 19:50:35 +0200 |
| commit | 29993ba41c50e8096ffd25fe704990479248d061 (patch) | |
| tree | 209e48cfa72b02bfa1543f11469855d6a349e76c /linux/drivers/media/video/zoran_driver.c | |
| parent | e65320dd8af749a0fe8242b59921b56d4eaf8d27 (diff) | |
| download | mediapointer-dvb-s2-29993ba41c50e8096ffd25fe704990479248d061.tar.gz mediapointer-dvb-s2-29993ba41c50e8096ffd25fe704990479248d061.tar.bz2 | |
Use v4l2_pix_out_fmt instead of v4l2_pix_fmt for video output format
From: Hans Verkuil <hverkuil@xs4all.nl>
Adding top/left fields to v4l2_pix_fmt broke the ABI. To fix this a new
v4l2_pix_out_fmt struct was introduced to specify the video output format.
This new struct *does* have the additional top/left fields.
The V4L2_CAP_VIDEO_OUTPUT_POS capability that was introduced is no longer
needed and is removed.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/zoran_driver.c')
| -rw-r--r-- | linux/drivers/media/video/zoran_driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran_driver.c b/linux/drivers/media/video/zoran_driver.c index de85abc45..38c1c5978 100644 --- a/linux/drivers/media/video/zoran_driver.c +++ b/linux/drivers/media/video/zoran_driver.c @@ -2894,8 +2894,12 @@ zoran_do_ioctl (struct inode *inode, return res; break; - case V4L2_BUF_TYPE_VIDEO_CAPTURE: case V4L2_BUF_TYPE_VIDEO_OUTPUT: + /* Clear v4l2_pix_out_format fields, the position is always 0. */ + fmt->fmt.pix_out.top = 0; + fmt->fmt.pix_out.left = 0; + /* fall through */ + case V4L2_BUF_TYPE_VIDEO_CAPTURE: printformat = __cpu_to_le32(fmt->fmt.pix.pixelformat); |