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

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

Merge "[media] v4l2-ctrls: Add missing qmenu entries for MPEG ctrls"

parents e0fb04b7 ab4a7576

drivers/media/v4l2-core/v4l2-ctrls.c

+4 −0
Original line number Diff line number Diff line
@@ -338,6 +338,9 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		"4.2",

		"5",

		"5.1",

		"5.2",

		"6.0",

		"Unknown",

		NULL,

	};

	static const char * const h264_loop_filter[] = {
@@ -364,6 +367,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		"Scalable High Intra",

		"Stereo High",

		"Multiview High",

		"Constrained High",

		NULL,

	};

	static const char * const vui_sar_idc[] = {