diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 11:08:35 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 11:08:35 -0400 |
commit | 80c1834fc86c2bbacb54a8fc3c04a8b0066b0996 (patch) | |
tree | 8200248706960af8b779e9144f5b51c670602228 /Documentation/DocBook/media/v4l/pixfmt.xml | |
parent | 22076c7712be29a602de45b1c573f31adbd428a9 (diff) | |
parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) |
Merge tag 'v3.5-rc6' into irqdomain/next
Linux 3.5-rc6
Diffstat (limited to 'Documentation/DocBook/media/v4l/pixfmt.xml')
-rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt.xml | 4 |
1 files changed, 2 insertions, 2 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> |