From patchwork Mon Aug 1 14:51:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Debski X-Patchwork-Id: 1026092 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p71Epvqt013111 for ; Mon, 1 Aug 2011 14:51:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145Ab1HAOvz (ORCPT ); Mon, 1 Aug 2011 10:51:55 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:41461 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751859Ab1HAOvy (ORCPT ); Mon, 1 Aug 2011 10:51:54 -0400 Received: from spt2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by mailout2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0LP9002GO7YHZX@mailout2.w1.samsung.com> for linux-media@vger.kernel.org; Mon, 01 Aug 2011 15:51:53 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LP900K467YFS8@spt2.w1.samsung.com> for linux-media@vger.kernel.org; Mon, 01 Aug 2011 15:51:51 +0100 (BST) Received: from mcdsrvbld02.digital.local (unknown [106.116.37.23]) by linux.samsung.com (Postfix) with ESMTP id 304A427004A; Mon, 01 Aug 2011 16:53:05 +0200 (CEST) Date: Mon, 01 Aug 2011 16:51:39 +0200 From: Kamil Debski Subject: [PATCH] v4l2: Fix documentation of the codec device controls To: linux-media@vger.kernel.org Cc: kyungmin.park@samsung.com, k.debski@samsung.com, jaeryul.oh@samsung.com, rdunlap@xenotime.net, mchehab@infradead.org Message-id: <1312210299-8040-1-git-send-email-k.debski@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.5.4 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 01 Aug 2011 14:51:57 +0000 (UTC) Fixed missing ids of the codec controls description in the controls.xml file. Signed-off-by: Kamil Debski Signed-off-by: Kyungmin Park Reported-by: Randy Dunlap --- Hi, This patch fixes the problem with codec controls documentation reported by Randy in the following email: http://comments.gmane.org/gmane.linux.drivers.video-input-infrastructure/36288 Thanks for reporting those errors. Best wishes, Kamil --- Documentation/DocBook/media/v4l/controls.xml | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 8516401..09d6872 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml @@ -1455,7 +1455,7 @@ Applicable to the H264 encoder. - + V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC  enum v4l2_mpeg_video_h264_vui_sar_idc @@ -1561,7 +1561,7 @@ Applicable to the H264 encoder. - + V4L2_CID_MPEG_VIDEO_H264_LEVEL  enum v4l2_mpeg_video_h264_level @@ -1641,7 +1641,7 @@ Possible values are: - + V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL  enum v4l2_mpeg_video_mpeg4_level @@ -1689,7 +1689,7 @@ Possible values are: - + V4L2_CID_MPEG_VIDEO_H264_PROFILE  enum v4l2_mpeg_h264_profile @@ -1774,7 +1774,7 @@ Possible values are: - + V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE  enum v4l2_mpeg_mpeg4_profile @@ -1820,7 +1820,7 @@ Applicable to the encoder. - + V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE  enum v4l2_mpeg_multi_slice_mode @@ -1868,7 +1868,7 @@ Applicable to the encoder. - + V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE  enum v4l2_mpeg_h264_loop_filter_mode @@ -1913,9 +1913,9 @@ Applicable to the H264 encoder. - + V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE  - enum v4l2_mpeg_h264_symbol_mode + enum v4l2_mpeg_h264_entropy_mode Entropy coding mode for H264 - CABAC/CAVALC. Applicable to the H264 encoder. @@ -2140,7 +2140,7 @@ previous frames. Applicable to the H264 encoder. - + V4L2_CID_MPEG_VIDEO_HEADER_MODE  enum v4l2_mpeg_header_mode @@ -2320,7 +2320,7 @@ Valid only when H.264 and macroblock level RC is enabled (V4L2_CID_MPE Applicable to the H264 encoder. - + V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE  enum v4l2_mpeg_mfc51_frame_skip_mode @@ -2361,7 +2361,7 @@ the stream will meet tight bandwidth contraints. Applicable to encoders. - + V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE  enum v4l2_mpeg_mfc51_force_frame_type