diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-01 11:06:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 14:57:51 -0300 |
| commit | 5da545ad08a3c6ea71d3ba074adc7582e7e9a024 (patch) | |
| tree | 2a3f5a859822518184a4507a60fbaccbab486611 /include/media | |
| parent | 4894b709d14c593466cc05e55ee493af931205e8 (diff) | |
| download | linux-3.10-5da545ad08a3c6ea71d3ba074adc7582e7e9a024.tar.gz linux-3.10-5da545ad08a3c6ea71d3ba074adc7582e7e9a024.tar.bz2 linux-3.10-5da545ad08a3c6ea71d3ba074adc7582e7e9a024.zip | |
[media] saa7146: move overlay information from saa7146_fh into saa7146_vv
This is global information, not per-filehandle information.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/saa7146_vv.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index b4761edafa6..feb444b554a 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -88,9 +88,6 @@ struct saa7146_fh { /* if this is a vbi or capture open */ enum v4l2_buf_type type; - /* video overlay */ - struct saa7146_overlay ov; - /* video capture */ struct videobuf_queue video_q; struct v4l2_pix_format video_fmt; @@ -119,9 +116,9 @@ struct saa7146_vv struct saa7146_fh *video_fh; /* video overlay */ + struct saa7146_overlay ov; struct v4l2_framebuffer ov_fb; struct saa7146_format *ov_fmt; - struct saa7146_overlay *ov_data; struct saa7146_fh *ov_suspend; /* video capture */ |