---

yaml --- r: 137960 b: refs/heads/master c: 96b8e14 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 32bc179 · 32bc179
1 parent 5421ea9
commit 32bc179
Show file tree

Hide file tree

Showing 3 changed files with 1,115 additions and 1,446 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17bdd9ddd14dc4d15277aacb277272f7a6c4eb2a
+refs/heads/master: 96b8e145f0a6f3c0470b5cdbe7ba9be314bb556f
diff --git a/trunk/drivers/media/video/zoran/zoran.h b/trunk/drivers/media/video/zoran/zoran.h
@@ -312,7 +312,6 @@ struct zoran_jpg_struct {
 	struct zoran_jpg_buffer buffer[BUZ_MAX_FRAME];	/* buffers */
 	int num_buffers, buffer_size;
 	u8 allocated;		/* Flag if buffers are allocated  */
-	u8 ready_to_be_freed;	/* hack - see zoran_driver.c */
 	u8 need_contiguous;	/* Flag if contiguous buffers are needed */
 };
 
@@ -321,7 +320,6 @@ struct zoran_v4l_struct {
 	struct zoran_v4l_buffer buffer[VIDEO_MAX_FRAME];	/* buffers */
 	int num_buffers, buffer_size;
 	u8 allocated;		/* Flag if buffers are allocated  */
-	u8 ready_to_be_freed;	/* hack - see zoran_driver.c */
 };
 
 struct zoran;