Commit ac5f867f authored May 28, 2013 by Andrzej Hajda Committed by Mauro Carvalho Chehab Jun 03, 2013

[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>

parent fc906b6d

drivers/media/platform/s5p-mfc/s5p_mfc_common.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -438,7 +438,7 @@ struct s5p_mfc_enc_params {
	u32 rc_framerate_num;		u32 rc_framerate_num;
	u32 rc_framerate_denom;		u32 rc_framerate_denom;

	union {		struct {
	struct s5p_mfc_h264_enc_params h264;		struct s5p_mfc_h264_enc_params h264;
	struct s5p_mfc_mpeg4_enc_params mpeg4;		struct s5p_mfc_mpeg4_enc_params mpeg4;
	} codec;		} codec;