From 96843eaaeac489ba36b9f977d9d632d9133f8e7b Mon Sep 17 00:00:00 2001 From: Michael Schimek Date: Mon, 22 May 2006 10:32:11 -0300 Subject: [PATCH] --- yaml --- r: 29956 b: refs/heads/master c: 419ac5d466db4dba3eb6bd79ffe993b4a4e81b4f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-core.c | 2 +- trunk/drivers/media/video/cx88/cx88-vbi.c | 4 ++-- trunk/drivers/media/video/cx88/cx88.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a1556852ef9c..d645a29f79c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f2c8a9c5377bf48dcf1d1df7df11a3ef442c505 +refs/heads/master: 419ac5d466db4dba3eb6bd79ffe993b4a4e81b4f diff --git a/trunk/drivers/media/video/cx88/cx88-core.c b/trunk/drivers/media/video/cx88/cx88-core.c index e1092d5d4628..2214235f76d3 100644 --- a/trunk/drivers/media/video/cx88/cx88-core.c +++ b/trunk/drivers/media/video/cx88/cx88-core.c @@ -677,7 +677,7 @@ static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) static unsigned int inline norm_vbipack(struct cx88_tvnorm *norm) { - return (norm->id & V4L2_STD_625_50) ? 511 : 288; + return (norm->id & V4L2_STD_625_50) ? 511 : 400; } int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int height, diff --git a/trunk/drivers/media/video/cx88/cx88-vbi.c b/trunk/drivers/media/video/cx88/cx88-vbi.c index 846faadc9f1c..aa2a69770098 100644 --- a/trunk/drivers/media/video/cx88/cx88-vbi.c +++ b/trunk/drivers/media/video/cx88/cx88-vbi.c @@ -34,8 +34,8 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f) if (dev->core->tvnorm->id & V4L2_STD_525_60) { /* ntsc */ f->fmt.vbi.sampling_rate = 28636363; - f->fmt.vbi.start[0] = 10 -1; - f->fmt.vbi.start[1] = 273 -1; + f->fmt.vbi.start[0] = 10; + f->fmt.vbi.start[1] = 273; } else if (dev->core->tvnorm->id & V4L2_STD_625_50) { /* pal */ diff --git a/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h index 84c87707203b..8413e54ef4b8 100644 --- a/trunk/drivers/media/video/cx88/cx88.h +++ b/trunk/drivers/media/video/cx88/cx88.h @@ -35,7 +35,7 @@ #include #include -#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5) +#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6) #ifndef TRUE # define TRUE (1==1)