Merge "msm vidc: Update flags for secure scaling control"

This commit is contained in:
Linux Build Service Account 2017-03-21 05:00:27 -07:00 committed by Gerrit - the friendly Code Review server
commit 2dd84150c7

View file

@ -528,7 +528,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = {
.step = 1, .step = 1,
.menu_skip_mask = 0, .menu_skip_mask = 0,
.qmenu = NULL, .qmenu = NULL,
.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,
}, },
{ {
.id = V4L2_CID_MPEG_VIDC_VIDEO_NON_SECURE_OUTPUT2, .id = V4L2_CID_MPEG_VIDC_VIDEO_NON_SECURE_OUTPUT2,