summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/s5p-tv
diff options
context:
space:
mode:
authorGuennadi Liakhovetski2011-08-24 15:30:21 +0200
committerMauro Carvalho Chehab2011-11-03 21:28:28 +0100
commitfc714e70dd063e6887d09872ac6158b0c20cc817 (patch)
treea77f60bcc14a452c67166c0c4d4a2039efb2f9c2 /drivers/media/video/s5p-tv
parent[media] V4L: document the new VIDIOC_CREATE_BUFS and VIDIOC_PREPARE_BUF ioctl()s (diff)
downloadkernel-qcow2-linux-fc714e70dd063e6887d09872ac6158b0c20cc817.tar.gz
kernel-qcow2-linux-fc714e70dd063e6887d09872ac6158b0c20cc817.tar.xz
kernel-qcow2-linux-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/s5p-tv')
-rw-r--r--drivers/media/video/s5p-tv/mixer_video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c
index 4917e2c2b321..e16d3a4bc1dc 100644
--- a/drivers/media/video/s5p-tv/mixer_video.c
+++ b/drivers/media/video/s5p-tv/mixer_video.c
@@ -727,8 +727,8 @@ static const struct v4l2_file_operations mxr_fops = {
.unlocked_ioctl = video_ioctl2,
};
-static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
- unsigned int *nplanes, unsigned int sizes[],
+static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *pfmt,
+ unsigned int *nbuffers, unsigned int *nplanes, unsigned int sizes[],
void *alloc_ctxs[])
{
struct mxr_layer *layer = vb2_get_drv_priv(vq);