commit 270f90d8e38984dade522900bed0fdbb509b4ec3
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 10 01:13:52 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 10 01:13:51 2014 -0700
tree 21782d56dc408da64b22208cde9e6d298b9a5525
parent b8fcf927c518224b5cbf0139af01d109146ee190
parent c9d4589660fa64762efe216f5b56cacf9ade0eb8

Merge "msm: vidc: Update vb2q buffer sizes"

drivers/media/platform/msm/vidc/msm_venc.c

diff --git a/drivers/media/platform/msm/vidc/msm_venc.c b/drivers/media/platform/msm/vidc/msm_venc.c
index 96c2bac..18432dd 100644
--- a/drivers/media/platform/msm/vidc/msm_venc.c
+++ b/drivers/media/platform/msm/vidc/msm_venc.c
@@ -2652,8 +2652,16 @@
 				buff_req_buffer->buffer_size : 0;
 		}
 		for (i = 0; i < fmt->num_planes; ++i) {
-			inst->bufq[CAPTURE_PORT].vb2_bufq.plane_sizes[i] =
-			f->fmt.pix_mp.plane_fmt[i].sizeimage;
+			if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+				inst->bufq[OUTPUT_PORT].vb2_bufq.
+				plane_sizes[i] =
+				f->fmt.pix_mp.plane_fmt[i].sizeimage;
+			} else if (f->type ==
+				V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
+				inst->bufq[CAPTURE_PORT].vb2_bufq.
+				plane_sizes[i] =
+				f->fmt.pix_mp.plane_fmt[i].sizeimage;
+			}
 		}
 	} else {
 		dprintk(VIDC_ERR,