---

yaml --- r: 377189 b: refs/heads/master c: ac5f867 h: refs/heads/master i: 377187: 378138b v: v3
git-mirror · Jun 3, 2013 · 745f1af · 745f1af
1 parent 4a453e9
commit 745f1af
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: fc906b6d189f26e869b11b94eaa9a733b3950740
+refs/heads/master: ac5f867fbfbd1ff5a43e796ed470deff42b630d2
diff --git a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -438,7 +438,7 @@ struct s5p_mfc_enc_params {
 	u32 rc_framerate_num;
 	u32 rc_framerate_denom;
 
-	union {
+	struct {
 		struct s5p_mfc_h264_enc_params h264;
 		struct s5p_mfc_mpeg4_enc_params mpeg4;
 	} codec;