Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83946efd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Remove read-only flags for profile and level clusters"

parents 0b3476f6 64573c37

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

+2 −2
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.maximum = V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH,

		.default_value = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE,

		.menu_skip_mask = 0,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.qmenu = NULL,

	},

	{
@@ -402,7 +402,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_5_2,

		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

		.menu_skip_mask = 0,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.qmenu = NULL,

	},

	{