---

yaml --- r: 276870 b: refs/heads/master c: a626f39 h: refs/heads/master v: v3
git-mirror · Dec 11, 2011 · 75fdbfd · 75fdbfd
1 parent 4b893e0
commit 75fdbfd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1ee8878a142f81ea1b40d602c6360b752829437
+refs/heads/master: a626f3945208af1d60d3dccf064cac3b15bc54ca
diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc_enc.c
@@ -61,7 +61,7 @@ static struct s5p_mfc_fmt formats[] = {
 		.num_planes = 1,
 	},
 	{
-		.name = "H264 Encoded Stream",
+		.name = "H263 Encoded Stream",
 		.fourcc = V4L2_PIX_FMT_H263,
 		.codec_mode = S5P_FIMV_CODEC_H263_ENC,
 		.type = MFC_FMT_ENC,