summaryrefslogtreecommitdiff
path: root/drivers/media/pci/saa7134/saa7134.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-31 15:22:24 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 17:08:27 +0400
commitb12262f9472d714341d9d83f47cccd76c977aa0e (patch)
treef80ef90f69a67e85fac3a95bb660c81b3c2a6688 /drivers/media/pci/saa7134/saa7134.h
parent8fcd4769de1528cd058590b17d783050a53819da (diff)
downloadlinux-b12262f9472d714341d9d83f47cccd76c977aa0e.tar.xz
[media] saa7134: move the overlay fields from saa7134_fh to saa7134_dev
This is global data, not per-filehandle data. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134.h')
-rw-r--r--drivers/media/pci/saa7134/saa7134.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index a103678cd499..fa21d14ea16e 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -474,11 +474,6 @@ struct saa7134_fh {
unsigned int resources;
struct pm_qos_request qos_request;
- /* video overlay */
- struct v4l2_window win;
- struct v4l2_clip clips[8];
- unsigned int nclips;
-
/* video capture */
struct saa7134_format *fmt;
unsigned int width,height;
@@ -590,6 +585,10 @@ struct saa7134_dev {
struct saa7134_format *ovfmt;
unsigned int ovenable;
enum v4l2_field ovfield;
+ struct v4l2_window win;
+ struct v4l2_clip clips[8];
+ unsigned int nclips;
+
/* video+ts+vbi capture */
struct saa7134_dmaqueue video_q;