Merge android-4.4.187 (8eb3d65) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / media / v4l2-core / v4l2-ctrls.c

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 3140ffb..6bb6d8a 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -307,12 +307,14 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
        static const char * const header_mode[] = {
                "Separate Buffer",
                "Joined With 1st Frame",
+               "Joined With I frame",
                NULL,
        };
        static const char * const multi_slice[] = {
                "Single",
                "Max Macroblocks",
                "Max Bytes",
+               "GOB",
                NULL,
        };
        static const char * const entropy_mode[] = {
@@ -337,6 +339,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
                "4.2",
                "5",
                "5.1",
+               "5.2",
                NULL,
        };
        static const char * const h264_loop_filter[] = {
@@ -361,7 +364,9 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
                "Scalable Baseline",
                "Scalable High",
                "Scalable High Intra",
+               "Stereo High",
                "Multiview High",
+               "Constrained High",
                NULL,
        };
        static const char * const vui_sar_idc[] = {