diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 15:53:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 15:53:54 -0500 |
| commit | 4a7c1ff2362b7bfbc04990f42c21cefdff57f997 (patch) | |
| tree | 82ac9c30ca95b6a92084f5535e6406866eb99cf3 /Documentation/DocBook/media/v4l/vidioc-g-input.xml | |
| parent | 9278e634b4e063f415b46923a9ca4e74f42ec932 (diff) | |
| parent | 36be126cb0ebe3000a65c1049f339a3e882a9a47 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits)
[media] as3645a: Fix compilation by including slab.h
[media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c
[media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c
[media] ds3000: using logical && instead of bitwise &
[media] v4l2-ctrls: make control names consistent
[media] DVB: dib0700, add support for Nova-TD LEDs
[media] DVB: dib0700, add corrected Nova-TD frontend_attach
[media] DVB: dib0700, separate stk7070pd initialization
[media] DVB: dib0700, move Nova-TD Stick to a separate set
[media] : add MODULE_FIRMWARE to dib0700
[media] DVB-CORE: remove superfluous DTV_CMDs
[media] s5p-jpeg: adapt to recent videobuf2 changes
[media] s5p-g2d: fixed a bug in controls setting function
[media] s5p-mfc: Fix volatile controls setup
[media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test
[media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test
[media] s5p-fimc: Fix incorrect control ID assignment
[media] dvb_frontend: Don't call get_frontend() if idle
[media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T
[media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters
...
Diffstat (limited to 'Documentation/DocBook/media/v4l/vidioc-g-input.xml')
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-input.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-input.xml b/Documentation/DocBook/media/v4l/vidioc-g-input.xml index 08ae82f131f2..1d43065090dd 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-input.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-input.xml | |||
| @@ -61,8 +61,8 @@ desired input in an integer and call the | |||
| 61 | <constant>VIDIOC_S_INPUT</constant> ioctl with a pointer to this | 61 | <constant>VIDIOC_S_INPUT</constant> ioctl with a pointer to this |
| 62 | integer. Side effects are possible. For example inputs may support | 62 | integer. Side effects are possible. For example inputs may support |
| 63 | different video standards, so the driver may implicitly switch the | 63 | different video standards, so the driver may implicitly switch the |
| 64 | current standard. It is good practice to select an input before | 64 | current standard. Because of these possible side effects applications |
| 65 | querying or negotiating any other parameters.</para> | 65 | must select an input before querying or negotiating any other parameters.</para> |
| 66 | 66 | ||
| 67 | <para>Information about video inputs is available using the | 67 | <para>Information about video inputs is available using the |
| 68 | &VIDIOC-ENUMINPUT; ioctl.</para> | 68 | &VIDIOC-ENUMINPUT; ioctl.</para> |