diff options
| author | Andrzej Hajda <a.hajda@samsung.com> | 2013-05-28 03:26:14 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-03 15:56:21 -0300 |
| commit | ac5f867fbfbd1ff5a43e796ed470deff42b630d2 (patch) | |
| tree | 7e03a120e7fef969258ee4f8a83e6bf56c32b43e /drivers/media/platform/s5p-mfc/s5p_mfc_common.h | |
| parent | fc906b6d189f26e869b11b94eaa9a733b3950740 (diff) | |
[media] s5p-mfc: separate encoder parameters for h264 and mpeg4
This patch fixes a bug which caused overwriting h264 codec
parameters by mpeg4 parameters during V4L2 control setting.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc_common.h')
| -rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index 4e81ab892bd..ef4074cd531 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h +++ b/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; |