[GIT,PULL,FOR,v3.17] Two code fixes, two doc fixes
Message ID | 53D2053B.1080802@xs4all.nl (mailing list archive) |
---|---|
State | Accepted, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1XAZnz-0000RG-Em; Fri, 25 Jul 2014 09:20:39 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1XAZnx-0001c2-1Q; Fri, 25 Jul 2014 09:20:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750869AbaGYHUe (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Fri, 25 Jul 2014 03:20:34 -0400 Received: from smtp-vbr4.xs4all.nl ([194.109.24.24]:4229 "EHLO smtp-vbr4.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750792AbaGYHUe (ORCPT <rfc822;linux-media@vger.kernel.org>); Fri, 25 Jul 2014 03:20:34 -0400 Received: from tschai.lan (209.80-203-20.nextgentel.com [80.203.20.209] (may be forged)) (authenticated bits=0) by smtp-vbr4.xs4all.nl (8.13.8/8.13.8) with ESMTP id s6P7KSBS026960 for <linux-media@vger.kernel.org>; Fri, 25 Jul 2014 09:20:32 +0200 (CEST) (envelope-from hverkuil@xs4all.nl) Received: from [127.0.0.1] (localhost [127.0.0.1]) by tschai.lan (Postfix) with ESMTPSA id A1A202A037E for <linux-media@vger.kernel.org>; Fri, 25 Jul 2014 09:20:27 +0200 (CEST) Message-ID: <53D2053B.1080802@xs4all.nl> Date: Fri, 25 Jul 2014 09:20:27 +0200 From: Hans Verkuil <hverkuil@xs4all.nl> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.0 MIME-Version: 1.0 To: Linux Media Mailing List <linux-media@vger.kernel.org> Subject: [GIT PULL FOR v3.17] Two code fixes, two doc fixes Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Virus-Scanned: by XS4ALL Virus Scanner Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.7.25.70920 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __MOZILLA_USER_AGENT 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' |
Pull-request
git://linuxtv.org/hverkuil/media_tree.git for-v3.17fMessage
Hans Verkuil
July 25, 2014, 7:20 a.m. UTC
Two vb2 patches: one fixes outdated comments, one fixes a poll bug w.r.t. output streams (found while adding output streaming support to qv4l2). One v4l2-ctrls enhancement: simplify how controls are set from within the kernel and add a function to set a string controls. One DocBook clarification how data_offset works. Regards, Hans The following changes since commit 488046c237f3b78f91046d45662b318cd2415f64: [media] rc: Fix compilation of st_rc and sunxi-cir (2014-07-23 23:04:17 -0300) are available in the git repository at: git://linuxtv.org/hverkuil/media_tree.git for-v3.17f for you to fetch changes up to 2c10f031e7bf44c22660deb2bf9d0c0be1bf8491: vb2: fix vb2_poll for output streams (2014-07-25 09:12:12 +0200) ---------------------------------------------------------------- Hans Verkuil (4): Docbook/media: improve data_offset/bytesused documentation v4l2-ctrls: add support for setting string controls vb2: fix videobuf2-core.h comments vb2: fix vb2_poll for output streams Documentation/DocBook/media/v4l/io.xml | 7 ++++++- drivers/media/v4l2-core/v4l2-ctrls.c | 47 ++++++++++++++++++++--------------------------- drivers/media/v4l2-core/videobuf2-core.c | 7 +++++++ include/media/v4l2-ctrls.h | 24 ++++++++++++++++++++++++ include/media/videobuf2-core.h | 16 ++++++++++------ 5 files changed, 67 insertions(+), 34 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html