diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-08-24 09:30:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 16:28:28 -0400 |
commit | fc714e70dd063e6887d09872ac6158b0c20cc817 (patch) | |
tree | a77f60bcc14a452c67166c0c4d4a2039efb2f9c2 /drivers/media/video/vivi.c | |
parent | 55093284fb6f9009a339e522773417bdd54ec144 (diff) |
[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 7cf94c09d99a..7d754fbcccbf 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) | |||
650 | /* ------------------------------------------------------------------ | 650 | /* ------------------------------------------------------------------ |
651 | Videobuf operations | 651 | Videobuf operations |
652 | ------------------------------------------------------------------*/ | 652 | ------------------------------------------------------------------*/ |
653 | static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, | 653 | static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, |
654 | unsigned int *nplanes, unsigned int sizes[], | 654 | unsigned int *nbuffers, unsigned int *nplanes, |
655 | void *alloc_ctxs[]) | 655 | unsigned int sizes[], void *alloc_ctxs[]) |
656 | { | 656 | { |
657 | struct vivi_dev *dev = vb2_get_drv_priv(vq); | 657 | struct vivi_dev *dev = vb2_get_drv_priv(vq); |
658 | unsigned long size; | 658 | unsigned long size; |