--- bttv-driver.c.orig	Wed Apr 30 11:04:56 2003
+++ bttv-driver.c	Sat May  3 16:05:54 2003
@@ -2336,6 +2336,7 @@
 		fmt->count[0]         = fmt2.fmt.vbi.count[0];
 		fmt->start[1]         = fmt2.fmt.vbi.start[1];
 		fmt->count[1]         = fmt2.fmt.vbi.count[1];
+		fmt->flags            = 0;
 		if (fmt2.fmt.vbi.flags & VBI_UNSYNC)
 			fmt->flags   |= V4L2_VBI_UNSYNC;
 		if (fmt2.fmt.vbi.flags & VBI_INTERLACED)
--- bttv-vbi.c.orig	Mon Apr 28 10:04:55 2003
+++ bttv-vbi.c	Wed May  7 21:44:21 2003
@@ -157,7 +157,8 @@
 
 void bttv_vbi_try_fmt(struct bttv_fh *fh, struct v4l2_format *f)
 {
-	u32 start0,start1,count0,count1,count;
+	u32 start0,start1;
+	s32 count0,count1,count;
 	
 	f->type = V4L2_BUF_TYPE_VBI_CAPTURE;
 	f->fmt.vbi.sampling_rate    = 35468950;
@@ -195,7 +196,6 @@
 {
 	memset(f,0,sizeof(*f));
 	f->type = V4L2_BUF_TYPE_VBI_CAPTURE;
-	f->fmt.vbi.sampling_rate    = 35468950;
 	f->fmt.vbi.samples_per_line = 2048;
 	f->fmt.vbi.sample_format    = V4L2_PIX_FMT_GREY;
 	f->fmt.vbi.offset           = 244;
@@ -206,12 +206,14 @@
 	case 1: /* NTSC */
 		f->fmt.vbi.start[0] = 10;
 		f->fmt.vbi.start[1] = 273;
+	        f->fmt.vbi.sampling_rate = 28636363;
 		break;
 	case 0: /* PAL */
 	case 2: /* SECAM */
 	default:
 		f->fmt.vbi.start[0] = 7;
 		f->fmt.vbi.start[1] = 319;
+	        f->fmt.vbi.sampling_rate = 35468950;
 	}
 }