diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-08-24 10:30:21 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 18:28:28 -0200 |
| commit | fc714e70dd063e6887d09872ac6158b0c20cc817 (patch) | |
| tree | a77f60bcc14a452c67166c0c4d4a2039efb2f9c2 /drivers/media/video/vivi.c | |
| parent | 55093284fb6f9009a339e522773417bdd54ec144 (diff) | |
| download | linux-3.10-fc714e70dd063e6887d09872ac6158b0c20cc817.tar.gz linux-3.10-fc714e70dd063e6887d09872ac6158b0c20cc817.tar.bz2 linux-3.10-fc714e70dd063e6887d09872ac6158b0c20cc817.zip | |
[media] V4L: vb2: prepare to support multi-size buffers
In preparation for the forthcoming VIDIOC_CREATE_BUFS ioctl add a
"const struct v4l2_format *" argument to the .queue_setup() vb2
operation.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vivi.c')
| -rw-r--r-- | drivers/media/video/vivi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 7cf94c09d99..7d754fbcccb 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -650,9 +650,9 @@ static void vivi_stop_generating(struct vivi_dev *dev) /* ------------------------------------------------------------------ Videobuf operations ------------------------------------------------------------------*/ -static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, - unsigned int *nplanes, unsigned int sizes[], - void *alloc_ctxs[]) +static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, + unsigned int *nbuffers, unsigned int *nplanes, + unsigned int sizes[], void *alloc_ctxs[]) { struct vivi_dev *dev = vb2_get_drv_priv(vq); unsigned long size; |