Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273705
b: refs/heads/master
c: 09362ec
h: refs/heads/master
i:
  273703: 86341cd
v: v3
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Nov 3, 2011
1 parent a0f99e4 commit 522cd0f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0934d94a52423fac35922c2e29d72a43db7ddd48
refs/heads/master: 09362ec25c3f42d00a4008d0622bfbca68e540f5
13 changes: 11 additions & 2 deletions trunk/drivers/media/video/v4l2-compat-ioctl32.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,20 @@ struct v4l2_format32 {
} fmt;
};

/**
* struct v4l2_create_buffers32 - VIDIOC_CREATE_BUFS32 argument
* @index: on return, index of the first created buffer
* @count: entry: number of requested buffers,
* return: number of created buffers
* @memory: buffer memory type
* @format: frame format, for which buffers are requested
* @reserved: future extensions
*/
struct v4l2_create_buffers32 {
__u32 index; /* output: buffers index...index + count - 1 have been created */
__u32 index;
__u32 count;
enum v4l2_memory memory;
struct v4l2_format32 format; /* filled in by the user, plane sizes calculated by the driver */
struct v4l2_format32 format;
__u32 reserved[8];
};

Expand Down
14 changes: 11 additions & 3 deletions trunk/include/linux/videodev2.h
Original file line number Diff line number Diff line change
Expand Up @@ -2142,12 +2142,20 @@ struct v4l2_dbg_chip_ident {
__u32 revision; /* chip revision, chip specific */
} __attribute__ ((packed));

/* VIDIOC_CREATE_BUFS */
/**
* struct v4l2_create_buffers - VIDIOC_CREATE_BUFS argument
* @index: on return, index of the first created buffer
* @count: entry: number of requested buffers,
* return: number of created buffers
* @memory: buffer memory type
* @format: frame format, for which buffers are requested
* @reserved: future extensions
*/
struct v4l2_create_buffers {
__u32 index; /* output: buffers index...index + count - 1 have been created */
__u32 index;
__u32 count;
enum v4l2_memory memory;
struct v4l2_format format; /* "type" is used always, the rest if sizeimage == 0 */
struct v4l2_format format;
__u32 reserved[8];
};

Expand Down

0 comments on commit 522cd0f

Please sign in to comment.