commit f8a364984d5636892d09c85d416e60d194cde9b1
author Linux Build Service Account <lnxbuild@localhost> Fri Feb 22 10:38:31 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Feb 22 10:38:30 2013 -0800
tree d90b08422f0a0e08564aacc7d01884441077ef2a
parent e130335cd21728b2e75ed9cad974904a50b6c9d4
parent c139bca21a4f003bc21f0715be0638d76eb7352e

Merge "msm: vidc: Set default bitrate mode as VBR"

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 7a51728..6402437 100644
--- a/drivers/media/platform/msm/vidc/msm_venc.c
+++ b/drivers/media/platform/msm/vidc/msm_venc.c
@@ -198,13 +198,13 @@
 		.type = V4L2_CTRL_TYPE_MENU,
 		.minimum = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
 		.maximum = V4L2_MPEG_VIDEO_BITRATE_MODE_CBR,
-		.default_value = V4L2_MPEG_VIDEO_BITRATE_MODE_CBR,
+		.default_value = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
 		.step = 0,
 		.menu_skip_mask = ~(
 		(1 << V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) |
 		(1 << V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)
 		),
-		.qmenu = mpeg_video_rate_control,
+		.qmenu = NULL,
 		.cluster = MSM_VENC_CTRL_CLUSTER_BITRATE,
 	},
 	{