diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-27 07:57:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-27 07:57:09 -0400 |
commit | a99817ca60d206be3645d156f755cf065e949c58 (patch) | |
tree | f95bcc12ba6f3de4181685ffb7042009439599d4 /Documentation/DocBook | |
parent | 81d75e9f56522ed340d7c72471b35ac8e25d823d (diff) | |
parent | 099987f0aaf28771261b91a41240b9228f2e32b2 (diff) |
Merge branch 'v4l_for_linus' into staging/for_v3.6
* v4l_for_linus: (44 commits)
[media] smia: Fix compile failures
[media] Fix VIDIOC_DQEVENT docbook entry
[media] s5p-fimc: Fix control creation function
[media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
[media] s5p-mfc: Fix setting controls
[media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
[media] v4l/s5p-mfc: corrected encoder v4l control definitions
[media] v4l: mem2mem_testdev: Fix race conditions in driver
[media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
[media] cxd2820r: Fix an incorrect modulation type bitmask
[media] em28xx: Show a warning if the board does not support remote controls
[media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
[media] USB: Staging: media: lirc: initialize spinlocks before usage
[media] Revert "[media] media: mx2_camera: Fix mbus format handling"
[media] bw-qcam: driver and pixfmt documentation fixes
[media] cx88: fix firmware load on big-endian systems
[media] cx18: support big-endian systems
[media] ivtv: fix support for big-endian systems
[media] tuner-core: return the frequency range of the correct tuner
[media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
...
Conflicts:
Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
drivers/media/video/em28xx/em28xx-cards.c
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt.xml | 4 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-create-bufs.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml index f5ac15ed0549..e58934c92895 100644 --- a/Documentation/DocBook/media/v4l/pixfmt.xml +++ b/Documentation/DocBook/media/v4l/pixfmt.xml | |||
@@ -986,13 +986,13 @@ http://www.thedirks.org/winnov/</ulink></para></entry> | |||
986 | <row id="V4L2-PIX-FMT-Y4"> | 986 | <row id="V4L2-PIX-FMT-Y4"> |
987 | <entry><constant>V4L2_PIX_FMT_Y4</constant></entry> | 987 | <entry><constant>V4L2_PIX_FMT_Y4</constant></entry> |
988 | <entry>'Y04 '</entry> | 988 | <entry>'Y04 '</entry> |
989 | <entry>Old 4-bit greyscale format. Only the least significant 4 bits of each byte are used, | 989 | <entry>Old 4-bit greyscale format. Only the most significant 4 bits of each byte are used, |
990 | the other bits are set to 0.</entry> | 990 | the other bits are set to 0.</entry> |
991 | </row> | 991 | </row> |
992 | <row id="V4L2-PIX-FMT-Y6"> | 992 | <row id="V4L2-PIX-FMT-Y6"> |
993 | <entry><constant>V4L2_PIX_FMT_Y6</constant></entry> | 993 | <entry><constant>V4L2_PIX_FMT_Y6</constant></entry> |
994 | <entry>'Y06 '</entry> | 994 | <entry>'Y06 '</entry> |
995 | <entry>Old 6-bit greyscale format. Only the least significant 6 bits of each byte are used, | 995 | <entry>Old 6-bit greyscale format. Only the most significant 6 bits of each byte are used, |
996 | the other bits are set to 0.</entry> | 996 | the other bits are set to 0.</entry> |
997 | </row> | 997 | </row> |
998 | </tbody> | 998 | </tbody> |
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index 015c561754b7..008c2d73a484 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml | |||
@@ -560,6 +560,7 @@ and discussions on the V4L mailing list.</revremark> | |||
560 | &sub-g-tuner; | 560 | &sub-g-tuner; |
561 | &sub-log-status; | 561 | &sub-log-status; |
562 | &sub-overlay; | 562 | &sub-overlay; |
563 | &sub-prepare-buf; | ||
563 | &sub-qbuf; | 564 | &sub-qbuf; |
564 | &sub-querybuf; | 565 | &sub-querybuf; |
565 | &sub-querycap; | 566 | &sub-querycap; |
@@ -567,7 +568,6 @@ and discussions on the V4L mailing list.</revremark> | |||
567 | &sub-query-dv-preset; | 568 | &sub-query-dv-preset; |
568 | &sub-query-dv-timings; | 569 | &sub-query-dv-timings; |
569 | &sub-querystd; | 570 | &sub-querystd; |
570 | &sub-prepare-buf; | ||
571 | &sub-reqbufs; | 571 | &sub-reqbufs; |
572 | &sub-s-hw-freq-seek; | 572 | &sub-s-hw-freq-seek; |
573 | &sub-streamon; | 573 | &sub-streamon; |
diff --git a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml index 7cf3116c2cc5..a2474ecb574a 100644 --- a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml +++ b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml | |||
@@ -108,7 +108,7 @@ information.</para> | |||
108 | /></entry> | 108 | /></entry> |
109 | </row> | 109 | </row> |
110 | <row> | 110 | <row> |
111 | <entry>&v4l2-format;</entry> | 111 | <entry>struct v4l2_format</entry> |
112 | <entry><structfield>format</structfield></entry> | 112 | <entry><structfield>format</structfield></entry> |
113 | <entry>Filled in by the application, preserved by the driver.</entry> | 113 | <entry>Filled in by the application, preserved by the driver.</entry> |
114 | </row> | 114 | </row> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml index e8714aa16433..98a856f9ec30 100644 --- a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml +++ b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml | |||
@@ -89,7 +89,7 @@ | |||
89 | <row> | 89 | <row> |
90 | <entry></entry> | 90 | <entry></entry> |
91 | <entry>&v4l2-event-frame-sync;</entry> | 91 | <entry>&v4l2-event-frame-sync;</entry> |
92 | <entry><structfield>frame</structfield></entry> | 92 | <entry><structfield>frame_sync</structfield></entry> |
93 | <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry> | 93 | <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry> |
94 | </row> | 94 | </row> |
95 | <row> | 95 | <row> |