---

yaml --- r: 85759 b: refs/heads/master c: 7c01880 h: refs/heads/master i: 85757: ae7fa49 85755: bc88dc4 85751: c5e1c8b 85743: 0bb6d21 85727: 8571c94 85695: 0929d7d 85631: 603f8bf 85503: a370114 v: v3
git-mirror · Feb 18, 2008 · 71053cf · 71053cf
1 parent 5156988
commit 71053cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9fe1d6ba603ddc5f2ef0a6b84f9df2bb4c679f1
+refs/heads/master: 7c018804c0900e7be18507f1eb24e631aa9816ea
diff --git a/trunk/drivers/media/video/bt8xx/bttv-driver.c b/trunk/drivers/media/video/bt8xx/bttv-driver.c
@@ -2760,6 +2760,7 @@ static int bttv_overlay(struct file *file, void *f, unsigned int on)
 	if (on) {
 		fh->ov.tvnorm = btv->tvnorm;
 		new = videobuf_pci_alloc(sizeof(*new));
+		new->crop = btv->crop[!!fh->do_crop].rect;
 		bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
 	} else {
 		new = NULL;