---

yaml --- r: 366803 b: refs/heads/master c: ac41fa2 h: refs/heads/master i: 366801: 23add30 366799: 6098c69 v: v3
git-mirror · Mar 24, 2013 · cfef0ac · cfef0ac
1 parent 249c8b9
commit cfef0ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778ca511537da58d9154ab8e1c1f0d1bf738aec8
+refs/heads/master: ac41fa2a41ba2eb224c982c2c8849169aca6310f
diff --git a/trunk/drivers/staging/media/go7007/go7007-driver.c b/trunk/drivers/staging/media/go7007/go7007-driver.c
@@ -435,16 +435,18 @@ static void write_bitmap_word(struct go7007 *go)
 void go7007_parse_video_stream(struct go7007 *go, u8 *buf, int length)
 {
 	struct go7007_buffer *vb = go->active_buf;
-	int i, seq_start_code = -1, frame_start_code = -1;
+	int i, seq_start_code = -1, gop_start_code = -1, frame_start_code = -1;
 
 	switch (go->format) {
 	case V4L2_PIX_FMT_MPEG4:
 		seq_start_code = 0xB0;
+		gop_start_code = 0xB3;
 		frame_start_code = 0xB6;
 		break;
 	case V4L2_PIX_FMT_MPEG1:
 	case V4L2_PIX_FMT_MPEG2:
 		seq_start_code = 0xB3;
+		gop_start_code = 0xB8;
 		frame_start_code = 0x00;
 		break;
 	}
@@ -526,7 +528,7 @@ void go7007_parse_video_stream(struct go7007 *go, u8 *buf, int length)
 			     go->format == V4L2_PIX_FMT_MPEG2 ||
 			     go->format == V4L2_PIX_FMT_MPEG4) &&
 			    (buf[i] == seq_start_code ||
-			     buf[i] == 0xB8 || /* GOP code */
+			     buf[i] == gop_start_code ||
 			     buf[i] == frame_start_code)) {
 				if (vb == NULL || go->seen_frame)
 					vb = frame_boundary(go, vb);