---

yaml --- r: 138135 b: refs/heads/master c: e5ee3f6 h: refs/heads/master i: 138133: b6632f0 138131: 67b502a 138127: 1c68166 v: v3
git-mirror · Mar 30, 2009 · eb5bb2a · eb5bb2a
1 parent 5691ec3
commit eb5bb2a
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 111 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee9a9d661d96e29d93859d20125bc7e4cc75309b
+refs/heads/master: e5ee3f643dd6d25c73cfd1e943abc9b529d63697
diff --git a/trunk/drivers/media/video/zoran/zoran_device.c b/trunk/drivers/media/video/zoran/zoran_device.c
@@ -535,12 +535,8 @@ zr36057_overlay (struct zoran *zr,
  *  and the maximum window size is BUZ_MAX_WIDTH * BUZ_MAX_HEIGHT pixels.
  */
 
-void
-write_overlay_mask (struct file       *file,
-		    struct v4l2_clip *vp,
-		    int                count)
+void write_overlay_mask(struct zoran_fh *fh, struct v4l2_clip *vp, int count)
 {
-	struct zoran_fh *fh = file->private_data;
 	struct zoran *zr = fh->zr;
 	unsigned mask_line_size = (BUZ_MAX_WIDTH + 31) / 32;
 	u32 *mask;

diff --git a/trunk/drivers/media/video/zoran/zoran_device.h b/trunk/drivers/media/video/zoran/zoran_device.h
@@ -54,7 +54,7 @@ extern int jpeg_codec_reset(struct zoran *zr);
 /* zr360x7 access to raw capture */
 extern void zr36057_overlay(struct zoran *zr,
 			    int on);
-extern void write_overlay_mask(struct file *file,
+extern void write_overlay_mask(struct zoran_fh *fh,
 			       struct v4l2_clip *vp,
 			       int count);
 extern void zr36057_set_memgrab(struct zoran *zr,