---

yaml --- r: 137830 b: refs/heads/master c: f37aa51 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · e557a67 · e557a67
1 parent 4112078
commit e557a67
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcc0ef88209a26719241bcb7741f05f1b9ecc30e
+refs/heads/master: f37aa51190c4391005bb71c92cd976f811500105
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.h b/trunk/drivers/media/video/cx18/cx18-driver.h
@@ -479,9 +479,6 @@ struct cx18 {
 	unsigned long dualwatch_jiffies;
 	u32 dualwatch_stereo_mode;
 
-	/* Digitizer type */
-	int digitizer;		/* 0x00EF = saa7114 0x00FO = saa7115 0x0106 = mic */
-
 	struct mutex serialize_lock;    /* mutex used to serialize open/close/start/stop/ioctl operations */
 	struct cx18_options options; 	/* User options */
 	int stream_buffers[CX18_MAX_STREAMS]; /* # of buffers for each stream */

diff --git a/trunk/drivers/media/video/cx18/cx18-streams.c b/trunk/drivers/media/video/cx18/cx18-streams.c
@@ -548,10 +548,11 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
 		/*
 		 * Number of lines for Field 1 & Field 2 according to
 		 * Documentation/video4linux/cx2341x/fw-encoder-api.txt
-		 * FIXME - currently we set this to 0 & 0 but things seem OK
+		 * Field 1 is 312 for 625 line systems in BT.656
+		 * Field 2 is 313 for 625 line systems in BT.656
 		 */
 		cx18_vapi(cx, CX18_CPU_SET_CAPTURE_LINE_NO, 3,
-			  s->handle, cx->digitizer, cx->digitizer);
+			  s->handle, 312, 313);
 
 		if (cx->v4l2_cap & V4L2_CAP_VBI_CAPTURE)
 			cx18_vbi_setup(s);