From patchwork Tue May 28 07:26:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 2623171 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2CE02DFB78 for ; Tue, 28 May 2013 07:26:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759079Ab3E1H05 (ORCPT ); Tue, 28 May 2013 03:26:57 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:9659 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759009Ab3E1H04 (ORCPT ); Tue, 28 May 2013 03:26:56 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MNH00BKWZCGH570@mailout3.w1.samsung.com> for linux-media@vger.kernel.org; Tue, 28 May 2013 08:26:54 +0100 (BST) X-AuditID: cbfec7f4-b7fd76d0000035e1-d7-51a45c3e4abc Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id E8.F0.13793.E3C54A15; Tue, 28 May 2013 08:26:54 +0100 (BST) Received: from AMDC1061.digital.local ([106.116.147.88]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MNH007RJZC6A160@eusync4.samsung.com>; Tue, 28 May 2013 08:26:54 +0100 (BST) From: Andrzej Hajda To: Kamil Debski , linux-media@vger.kernel.org Cc: Jeongtae Park , Sylwester Nawrocki , Kyungmin Park , Andrzej Hajda Subject: [PATCH 1/3] s5p-mfc: separate encoder parameters for h264 and mpeg4 Date: Tue, 28 May 2013 09:26:14 +0200 Message-id: <1369725976-7828-2-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.8.1.2 In-reply-to: <1369725976-7828-1-git-send-email-a.hajda@samsung.com> References: <1369725976-7828-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIJMWRmVeSWpSXmKPExsVy+t/xa7p2MUsCDd7uVre4te4cq8WRtVeZ LH68vsBmcbbpDbtFz4atrBaH37SzOrB59G1ZxejxeZNcAFMUl01Kak5mWWqRvl0CV0bz1aWs BUfZKg5/esTcwHiGtYuRk0NCwETiza3rbBC2mMSFe+uBbC4OIYGljBLn/nQwQTh9TBKff6xh BqliE9CU+Lv5JliHiICLxMIdpxlBipgFVjJKbJ80CywhLOAj0dq2jx3EZhFQlVhzcDILiM0r 4CTx/uETqNUKEj8vnwCq5+DgFHCWWDHVHsQUAiq5e7hyAiPvAkaGVYyiqaXJBcVJ6bmGesWJ ucWleel6yfm5mxghwfJlB+PiY1aHGAU4GJV4eC0zFwcKsSaWFVfmHmKU4GBWEuEV8V8SKMSb klhZlVqUH19UmpNafIiRiYNTqoGxMEzojU7pBp6Pm+SaVa/+djzfOqF3eYjeCxY2yUKlp9F/ Jy6RLr7mF5iquvptoG/yjyUWu4LU771n/v6Q+ynfpx8W/hbCp6Ssvnaf2iTxyJI/6esS9c4t OisEej9aFbFKJxb2LFp+YCZf7pu3bi7GTtcLdW/V387P22A2x3Racon34taM/kQlluKMREMt 5qLiRABB1SDT9AEAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This patch fixes a bug which caused overwriting h264 codec parameters by mpeg4 parameters during V4L2 control setting. Signed-off-by: Andrzej Hajda Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h index 202d1d7..098459e 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;