---

yaml --- r: 320089 b: refs/heads/master c: 31361fc h: refs/heads/master i: 320087: 93def9d v: v3
git-mirror · Jul 5, 2012 · 5875a10 · 5875a10
1 parent 67bd602
commit 5875a10
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b719d7baf490e24ce7d817c6337b7c87fda84c1
+refs/heads/master: 31361fc4632f20e3a108f56b1a1a9c9bf2dfc07c
diff --git a/trunk/include/media/videobuf-core.h b/trunk/include/media/videobuf-core.h
@@ -72,7 +72,6 @@ struct videobuf_buffer {
 	unsigned int            height;
 	unsigned int            bytesperline; /* use only if != 0 */
 	unsigned long           size;
-	unsigned int            input;
 	enum v4l2_field         field;
 	enum videobuf_state     state;
 	struct list_head        stream;  /* QBUF/DQBUF list */
@@ -142,7 +141,6 @@ struct videobuf_queue {
 	wait_queue_head_t	   wait; /* wait if queue is empty */
 
 	enum v4l2_buf_type         type;
-	unsigned int               inputs; /* for V4L2_BUF_FLAG_INPUT */
 	unsigned int               msize;
 	enum v4l2_field            field;
 	enum v4l2_field            last;   /* for field=V4L2_FIELD_ALTERNATE */