aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-05-01 10:06:44 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 13:57:51 -0400
commit5da545ad08a3c6ea71d3ba074adc7582e7e9a024 (patch)
tree2a3f5a859822518184a4507a60fbaccbab486611 /include/media
parent4894b709d14c593466cc05e55ee493af931205e8 (diff)
[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.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index b4761edafa69..feb444b554aa 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -88,9 +88,6 @@ struct saa7146_fh {
88 /* if this is a vbi or capture open */ 88 /* if this is a vbi or capture open */
89 enum v4l2_buf_type type; 89 enum v4l2_buf_type type;
90 90
91 /* video overlay */
92 struct saa7146_overlay ov;
93
94 /* video capture */ 91 /* video capture */
95 struct videobuf_queue video_q; 92 struct videobuf_queue video_q;
96 struct v4l2_pix_format video_fmt; 93 struct v4l2_pix_format video_fmt;
@@ -119,9 +116,9 @@ struct saa7146_vv
119 struct saa7146_fh *video_fh; 116 struct saa7146_fh *video_fh;
120 117
121 /* video overlay */ 118 /* video overlay */
119 struct saa7146_overlay ov;
122 struct v4l2_framebuffer ov_fb; 120 struct v4l2_framebuffer ov_fb;
123 struct saa7146_format *ov_fmt; 121 struct saa7146_format *ov_fmt;
124 struct saa7146_overlay *ov_data;
125 struct saa7146_fh *ov_suspend; 122 struct saa7146_fh *ov_suspend;
126 123
127 /* video capture */ 124 /* video capture */