From de550706fd0d95da2db70795dad6a9a747602e17 Mon Sep 17 00:00:00 2001
From: Andrzej Hajda <a.hajda@samsung.com>
Date: Tue, 12 Jun 2012 07:12:58 -0300
Subject: [PATCH] --- yaml --- r: 311295 b: refs/heads/master c:
 afd14f48a732758d6fbbc3a5fc5b211742102c4b h: refs/heads/master i:   311293:
 744a7a0ebc887cc5a695f3b113b9bcd8f44b2a23   311291:
 c14e4ff89cb3e1908f8cefc280b1908c549283e0   311287:
 f222189fbfa8009de89fa6ee81df18faff2d2396   311279:
 04881b5ca576bb71a89057447039248e5db8b36b   311263:
 dd8221b1eecd13182454e194342a65e9e1598022   311231:
 32a076024ab8ed9932048b210c8d81ea4b464035   311167:
 844235c4a4c330b76011b57f0128090c46fa6bce   311039:
 b07b455a7daefbe4ccd65121fdc4dd36bf70435b   310783:
 53570ff2cc94611e55de0c1279d4ab6080b014a3   310271:
 97f304f4a8226edfd912cf0c1255e07e52537530   309247:
 16667435e6776b6345b835d81b816f40854d960e   307199:
 34b6bccf204df912c58382bf4947d07ae895238c   303103:
 9f474f7c6cfc3ab1a97e9cdc0b28bb05351a865d   294911:
 35f6dac3f64b3fad7bff5dbe7847545534ed4009 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4631aba5833e..67180e85c43c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f4161a6b8796dc41dc3924d7869622f7975706a
+refs/heads/master: afd14f48a732758d6fbbc3a5fc5b211742102c4b
diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
index acedb2004be3..9c19aa8038dd 100644
--- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
+++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
@@ -243,12 +243,6 @@ static struct mfc_control controls[] = {
 		.minimum = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
 		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
 		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,
-		.menu_skip_mask = ~(
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_4_2) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_0) |
-				(1 << V4L2_MPEG_VIDEO_H264_LEVEL_5_1)
-				),
 	},
 	{
 		.id = V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
@@ -494,7 +488,7 @@ static struct mfc_control controls[] = {
 		.type = V4L2_CTRL_TYPE_MENU,
 		.minimum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
 		.maximum = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_EXTENDED,
-		.default_value = 0,
+		.default_value = V4L2_MPEG_VIDEO_H264_VUI_SAR_IDC_UNSPECIFIED,
 		.menu_skip_mask = 0,
 	},
 	{
@@ -534,7 +528,7 @@ static struct mfc_control controls[] = {
 		.type = V4L2_CTRL_TYPE_MENU,
 		.minimum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
 		.maximum = V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,
-		.default_value = 0,
+		.default_value = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,
 		.menu_skip_mask = 0,
 	},
 	{