From 71867641827cda5de79a848323cd64d46881c11b Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 11 Jan 2012 07:37:54 -0300 Subject: [PATCH] --- yaml --- r: 286388 b: refs/heads/master c: dacd4fa37dbafe209a90d6d5b729d2257df4b734 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/media/v4l/vidioc-g-input.xml | 4 ++-- trunk/Documentation/DocBook/media/v4l/vidioc-g-output.xml | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 102aadb4ca1e..732e368cf7f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6055b12ae0f433314cba98f423fb8c5fc211ca8d +refs/heads/master: dacd4fa37dbafe209a90d6d5b729d2257df4b734 diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-g-input.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-g-input.xml index 08ae82f131f2..1d43065090dd 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-g-input.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-g-input.xml @@ -61,8 +61,8 @@ desired input in an integer and call the VIDIOC_S_INPUT ioctl with a pointer to this integer. Side effects are possible. For example inputs may support different video standards, so the driver may implicitly switch the -current standard. It is good practice to select an input before -querying or negotiating any other parameters. +current standard. Because of these possible side effects applications +must select an input before querying or negotiating any other parameters. Information about video inputs is available using the &VIDIOC-ENUMINPUT; ioctl. diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-g-output.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-g-output.xml index fd45f1c13ccf..4533068ecb8a 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-g-output.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-g-output.xml @@ -61,8 +61,9 @@ desired output in an integer and call the VIDIOC_S_OUTPUT ioctl with a pointer to this integer. Side effects are possible. For example outputs may support different video standards, so the driver may implicitly switch the current -standard. It is good practice to select an output before querying or -negotiating any other parameters. +standard. +standard. Because of these possible side effects applications +must select an output before querying or negotiating any other parameters. Information about video outputs is available using the &VIDIOC-ENUMOUTPUT; ioctl.